diff --git a/commands/menuentry.c b/commands/menuentry.c
new file mode 100644
index 000000000..f27b246b1
--- /dev/null
+++ b/commands/menuentry.c
@@ -0,0 +1,59 @@
+/* menuentry.c - menuentry command */
+/*
+ *  GRUB  --  GRand Unified Bootloader
+ *  Copyright (C) 2010  Free Software Foundation, Inc.
+ *
+ *  GRUB is free software: you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation, either version 3 of the License, or
+ *  (at your option) any later version.
+ *
+ *  GRUB is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with GRUB.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include <grub/types.h>
+#include <grub/misc.h>
+#include <grub/err.h>
+#include <grub/dl.h>
+#include <grub/extcmd.h>
+#include <grub/i18n.h>
+#include <grub/normal.h>
+
+static grub_err_t
+grub_cmd_menuentry (grub_extcmd_context_t ctxt, int argc, char **args)
+{
+  char *src;
+  grub_err_t r;
+
+  /* XXX Rewrite to make use of already parsed menu definition.  */
+  if (! argc || ! ctxt->script_params || ! ctxt->script_params[argc - 1])
+    return GRUB_ERR_BAD_ARGUMENT;
+
+  src = args[argc - 1];
+  args[argc - 1] = '\0';
+
+  r = 0; //grub_normal_add_menu_entry (argc - 1, (const char **) args, src);
+
+  args[argc - 1] = src;
+  return r;
+}
+
+static grub_extcmd_t cmd;
+
+GRUB_MOD_INIT(menuentry)
+{
+  cmd = grub_register_extcmd ("menuentry", grub_cmd_menuentry,
+			      GRUB_COMMAND_FLAG_BOTH | GRUB_COMMAND_FLAG_BLOCKS,
+			      N_("BLOCK"), N_("Define a menuentry."), 0);
+}
+
+GRUB_MOD_FINI(menuentry)
+{
+  grub_unregister_extcmd (cmd);
+}
diff --git a/conf/common.rmk b/conf/common.rmk
index 3674cae07..b9a973f76 100644
--- a/conf/common.rmk
+++ b/conf/common.rmk
@@ -846,6 +846,12 @@ boot_mod_SOURCES = commands/boot.c lib/i386/pc/biosnum.c
 boot_mod_CFLAGS = $(COMMON_CFLAGS)
 boot_mod_LDFLAGS = $(COMMON_LDFLAGS)
 
+# For menuentry.mod.
+pkglib_MODULES += menuentry.mod
+menuentry_mod_SOURCES = commands/menuentry.c
+menuentry_mod_CFLAGS = $(COMMON_CFLAGS)
+menuentry_mod_LDFLAGS = $(COMMON_LDFLAGS)
+
 bin_UTILITIES += grub-mkpasswd-pbkdf2
 grub_mkpasswd_pbkdf2_SOURCES = gnulib/progname.c gnulib/getdelim.c gnulib/getline.c util/grub-mkpasswd-pbkdf2.c lib/crypto.c lib/libgcrypt-grub/cipher/sha512.c lib/pbkdf2.c util/misc.c kern/emu/misc.c kern/emu/mm.c kern/err.c
 grub_mkpasswd_pbkdf2_CFLAGS += -Wno-missing-field-initializers -Wno-error -I$(srcdir)/lib/libgcrypt_wrap -DGRUB_MKPASSWD=1