diff --git a/rosapps/downloader/lang/de-DE.rc b/rosapps/downloader/lang/de-DE.rc
index afa218a990f..fe221bbad0d 100644
--- a/rosapps/downloader/lang/de-DE.rc
+++ b/rosapps/downloader/lang/de-DE.rc
@@ -54,4 +54,7 @@ BEGIN
   IDS_DOWNLOAD_FOLDER		"Downloader"
   IDS_UNABLECREATE_FOLDER	"Es konnte kein Ordner mit diesem Namen erstellt werden!"
   IDS_UPDATE_URL		"http://svn.reactos.org"
+  TTT_HELPBUTTON, "Get help about the downloader"
+  TTT_UPDATEBUTTON, "Not yet available"
+  TTT_PROFBUTTON, "Let you configure the downloader"
 END
diff --git a/rosapps/downloader/lang/en-US.rc b/rosapps/downloader/lang/en-US.rc
index 62f5b207a88..319bc6d1fd2 100644
--- a/rosapps/downloader/lang/en-US.rc
+++ b/rosapps/downloader/lang/en-US.rc
@@ -54,4 +54,7 @@ BEGIN
   IDS_DOWNLOAD_FOLDER		"Downloader"
   IDS_UNABLECREATE_FOLDER	"Unable to create a folder with this name!"
   IDS_UPDATE_URL		"http://svn.reactos.org"
+  TTT_HELPBUTTON, "Get help about the downloader"
+  TTT_UPDATEBUTTON, "Not yet available"
+  TTT_PROFBUTTON, "Let you configure the downloader"
 END
diff --git a/rosapps/downloader/lang/es-ES.rc b/rosapps/downloader/lang/es-ES.rc
index 281798cc5cc..bab031480ef 100644
--- a/rosapps/downloader/lang/es-ES.rc
+++ b/rosapps/downloader/lang/es-ES.rc
@@ -59,4 +59,7 @@ BEGIN
   IDS_DOWNLOAD_FOLDER		"Downloader"
   IDS_UNABLECREATE_FOLDER	"¡Imposible crear una carpeta con este nombre!"
   IDS_UPDATE_URL		"http://svn.reactos.org"
+  TTT_HELPBUTTON, "Get help about the downloader"
+  TTT_UPDATEBUTTON, "Not yet available"
+  TTT_PROFBUTTON, "Let you configure the downloader"
 END
diff --git a/rosapps/downloader/lang/fr-FR.rc b/rosapps/downloader/lang/fr-FR.rc
index ba20b45db70..901d36232d2 100644
--- a/rosapps/downloader/lang/fr-FR.rc
+++ b/rosapps/downloader/lang/fr-FR.rc
@@ -54,4 +54,7 @@ BEGIN
   IDS_DOWNLOAD_FOLDER		"Downloader"
   IDS_UNABLECREATE_FOLDER	"Échec lors du répertoire avec ce nom !"
   IDS_UPDATE_URL		"http://svn.reactos.org"
+  TTT_HELPBUTTON, "Obtenez de l'aide à propros du téléchargeur"
+  TTT_UPDATEBUTTON, "Pas encore disponible"
+  TTT_PROFBUTTON, "Vous permet de configurer le téléchargeur"
 END
diff --git a/rosapps/downloader/lang/id-ID.rc b/rosapps/downloader/lang/id-ID.rc
index cdc1c1d92c7..1acb734a889 100644
--- a/rosapps/downloader/lang/id-ID.rc
+++ b/rosapps/downloader/lang/id-ID.rc
@@ -54,4 +54,7 @@ BEGIN
   IDS_DOWNLOAD_FOLDER		"Downloader"
   IDS_UNABLECREATE_FOLDER	"Unable to create a folder with this name!"
   IDS_UPDATE_URL		"http://svn.reactos.org"
+  TTT_HELPBUTTON, "Get help about the downloader"
+  TTT_UPDATEBUTTON, "Not yet available"
+  TTT_PROFBUTTON, "Let you configure the downloader"
 END
diff --git a/rosapps/downloader/lang/it-IT.rc b/rosapps/downloader/lang/it-IT.rc
index 03709954f2a..87cd6f79dbf 100644
--- a/rosapps/downloader/lang/it-IT.rc
+++ b/rosapps/downloader/lang/it-IT.rc
@@ -54,4 +54,7 @@ BEGIN
   IDS_DOWNLOAD_FOLDER		"Downloader"
   IDS_UNABLECREATE_FOLDER	"Unable to create a folder with this name!"
   IDS_UPDATE_URL		"http://svn.reactos.org"
+  TTT_HELPBUTTON, "Get help about the downloader"
+  TTT_UPDATEBUTTON, "Not yet available"
+  TTT_PROFBUTTON, "Let you configure the downloader"
 END
diff --git a/rosapps/downloader/lang/ru-RU.rc b/rosapps/downloader/lang/ru-RU.rc
index 882812588a5..5c85a2cd08a 100644
--- a/rosapps/downloader/lang/ru-RU.rc
+++ b/rosapps/downloader/lang/ru-RU.rc
@@ -56,4 +56,7 @@ BEGIN
   IDS_DOWNLOAD_FOLDER		"Ñêà÷àòü!"
   IDS_UNABLECREATE_FOLDER	"Íå óäàëîñü ñîçäàòü ïàïêó ñ òàêèì èìåíåì!"
   IDS_UPDATE_URL		"http://svn.reactos.org"
+  TTT_HELPBUTTON, "Get help about the downloader"
+  TTT_UPDATEBUTTON, "Not yet available"
+  TTT_PROFBUTTON, "Let you configure the downloader"
 END
diff --git a/rosapps/downloader/lang/uk-UA.rc b/rosapps/downloader/lang/uk-UA.rc
index c64977a8966..7e8cde5dcaf 100644
--- a/rosapps/downloader/lang/uk-UA.rc
+++ b/rosapps/downloader/lang/uk-UA.rc
@@ -62,4 +62,7 @@ BEGIN
   IDS_DOWNLOAD_FOLDER		"Downloader"
   IDS_UNABLECREATE_FOLDER	"Íå âäàëîñÿ ñòâîðèòè ïàïêó ç òàêèì ³ì'ÿì!"
   IDS_UPDATE_URL		"http://svn.reactos.org"
+  TTT_HELPBUTTON, "Get help about the downloader"
+  TTT_UPDATEBUTTON, "Not yet available"
+  TTT_PROFBUTTON, "Let you configure the downloader"
 END
diff --git a/rosapps/downloader/main.c b/rosapps/downloader/main.c
index 19c9c56655c..0bcb8483805 100644
--- a/rosapps/downloader/main.c
+++ b/rosapps/downloader/main.c
@@ -143,6 +143,31 @@ CategoryChoosen(HWND hwnd, struct Category* Category)
 	}
 }
 
+BOOL CreateToolTip(HWND hwndTool, HWND hDlg, WCHAR* pText)
+{
+	if (!hwndTool || !hDlg || !pText)
+		return FALSE;
+
+	HWND hwndTip = CreateWindowExW(0, TOOLTIPS_CLASS, NULL,
+									WS_POPUP |TTS_ALWAYSTIP | TTS_BALLOON,
+									CW_USEDEFAULT, CW_USEDEFAULT,
+									CW_USEDEFAULT, CW_USEDEFAULT,
+									hDlg, NULL, 
+									GetModuleHandle(NULL), NULL);
+	if (!hwndTip)
+		return FALSE;
+
+	TOOLINFO toolInfo = {0};
+	toolInfo.cbSize = sizeof(toolInfo);
+	toolInfo.hwnd = hDlg;
+	toolInfo.uFlags = TTF_IDISHWND | TTF_SUBCLASS;
+	toolInfo.uId = (UINT_PTR)hwndTool;
+	toolInfo.lpszText = pText;
+	SendMessage(hwndTip, TTM_ADDTOOL, 0, (LPARAM)&toolInfo);
+
+	return TRUE;
+}
+
 BOOL
 SetupControls (HWND hwnd)
 {
@@ -150,6 +175,7 @@ SetupControls (HWND hwnd)
 	HIMAGELIST hImageList;
 	HINSTANCE hInstance = GetModuleHandle(NULL);
 	WCHAR Cats[MAX_STRING_LENGHT], Apps[MAX_STRING_LENGHT];
+	WCHAR Tooltip1[MAX_STRING_LENGHT], Tooltip2[MAX_STRING_LENGHT], Tooltip3[MAX_STRING_LENGHT];
 	TCHAR Buf[MAX_PATH];
 	char Tmp[MAX_PATH];
 	int i;
@@ -184,18 +210,28 @@ SetupControls (HWND hwnd)
 								WS_CHILD | WS_VISIBLE | BS_ICON,
 								550, 10, 40, 40,
 								hwnd, 0, hInstance, NULL);
+	LoadString(hInstance, TTT_HELPBUTTON, Tooltip1, MAX_STRING_LENGHT);
+	CreateToolTip(hHelpButton, hwnd, Tooltip1);
+	
 	hUpdateButton = CreateWindowW(L"Button", L"",
 								  WS_CHILD | WS_VISIBLE | BS_ICON,
 								  450, 10, 40, 40,
 								  hwnd, 0, hInstance, NULL);
+	LoadString(hInstance, TTT_UPDATEBUTTON, Tooltip2, MAX_STRING_LENGHT);
+	CreateToolTip(hUpdateButton, hwnd, Tooltip2);
+								  
 	hProfButton = CreateWindowW(L"Button", L"",
 								WS_CHILD | WS_VISIBLE | BS_ICON,
 								500, 10, 40, 40,
 								hwnd, 0, hInstance, NULL);
+	LoadString(hInstance, TTT_PROFBUTTON, Tooltip3, MAX_STRING_LENGHT);
+	CreateToolTip(hProfButton, hwnd, Tooltip3);
+								
 	hDownloadButton = CreateWindowW(L"Button", L"",
 									WS_CHILD | WS_VISIBLE | BS_BITMAP,
 									330, 505, 140, 33,
 									hwnd, 0, hInstance, NULL);
+									
 	hUninstallButton = CreateWindowW(L"Button", L"",
 									 WS_CHILD | WS_VISIBLE | BS_BITMAP,
 									 260, 505, 140, 33,
diff --git a/rosapps/downloader/resources.h b/rosapps/downloader/resources.h
index 81777e0436e..7cd8a767a84 100644
--- a/rosapps/downloader/resources.h
+++ b/rosapps/downloader/resources.h
@@ -58,6 +58,10 @@
 #define IDS_UNABLECREATE_FOLDER	25
 #define IDS_UPDATE_URL			26
 
+#define TTT_HELPBUTTON			50
+#define TTT_UPDATEBUTTON		51
+#define TTT_PROFBUTTON			52
+
 #define IDD_PROF	6000