diff --git a/ChangeLog b/ChangeLog
index 01483a3ba..52cb5d401 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2010-01-06  Carles Pina i Estany  <carles@pina.cat>
+
+	* commands/search.c (GRUB_MOD_INIT): Use HELP_MESSAGE.
+	* commands/search_file.c (HELP_MESSAGE): New macro.
+	* commands/search_label.c (HELP_MESSAGE): Likewise.
+	* commands/search_uuid.c (HELP_MESSAGE): Likewise.
+	* po/POTFILES: Add `commands/search_file.c',
+	`commands/search_label.c', `commands_uuid.c'. Remove duplicate
+	`commands/search.c'.
+
 2010-01-05  Robert Millan  <rmh.grub@aybabtu.com>
 
 	* config.rpath: Update from Gnulib.
diff --git a/commands/search.c b/commands/search.c
index 2f0cef8aa..ec736de3c 100644
--- a/commands/search.c
+++ b/commands/search.c
@@ -166,9 +166,7 @@ GRUB_MOD_INIT(search_fs_label)
   cmd =
     grub_register_command (COMMAND_NAME, grub_cmd_do_search,
 			   N_("NAME [VARIABLE]"),
-			   "Search devices by " SEARCH_TARGET "."
-			   " If VARIABLE is specified, "
-			   "the first device found is set to a variable.");
+			   HELP_MESSAGE);
 }
 
 #ifdef DO_SEARCH_FILE
diff --git a/commands/search_file.c b/commands/search_file.c
index 265220001..73ce89ccc 100644
--- a/commands/search_file.c
+++ b/commands/search_file.c
@@ -2,4 +2,5 @@
 #define FUNC_NAME grub_search_fs_file
 #define COMMAND_NAME "search.file"
 #define SEARCH_TARGET "file"
+#define HELP_MESSAGE N_("Search devices by file. If VARIABLE is specified, the first device found is set to a variable.")
 #include "search.c"
diff --git a/commands/search_label.c b/commands/search_label.c
index 0047b0e8c..ee9c792be 100644
--- a/commands/search_label.c
+++ b/commands/search_label.c
@@ -2,4 +2,5 @@
 #define FUNC_NAME grub_search_label
 #define COMMAND_NAME "search.fs_label"
 #define SEARCH_TARGET "filesystem label"
+#define HELP_MESSAGE N_("Search devices by label. If VARIABLE is specified, the first device found is set to a variable.")
 #include "search.c"
diff --git a/commands/search_uuid.c b/commands/search_uuid.c
index 9767d6501..52f83812c 100644
--- a/commands/search_uuid.c
+++ b/commands/search_uuid.c
@@ -2,4 +2,5 @@
 #define FUNC_NAME grub_search_fs_uuid
 #define COMMAND_NAME "search.fs_uuid"
 #define SEARCH_TARGET "filesystem UUID"
+#define HELP_MESSAGE N_("Search devices by UUID. If VARIABLE is specified, the first device found is set to a variable.")
 #include "search.c"
diff --git a/po/POTFILES b/po/POTFILES
index cecf8a049..c4ae9d562 100644
--- a/po/POTFILES
+++ b/po/POTFILES
@@ -37,7 +37,9 @@ commands/probe.c
 commands/read.c
 commands/reboot.c
 commands/search.c
-commands/search.c
+commands/search_file.c
+commands/search_label.c
+commands/search_uuid.c
 commands/sleep.c
 commands/test.c
 commands/true.c