diff --git a/Makefile.am b/Makefile.am
index e268470c..b3a928eb 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -10,6 +10,7 @@ m4files =			\
 	m4/moo-gtk.m4		\
 	m4/moo-i18n.m4		\
 	m4/moo-lib.m4		\
+	m4/moo-lua.m4		\
 	m4/moo-objc.m4		\
 	m4/moo-os.m4		\
 	m4/moo-pcre.m4		\
diff --git a/moo/mooedit/Makefile.am b/moo/mooedit/Makefile.am
index fe987e98..88afe8ed 100644
--- a/moo/mooedit/Makefile.am
+++ b/moo/mooedit/Makefile.am
@@ -8,11 +8,11 @@ moocommand-exe-private.lo: moocommand-exe-unix.lo
 moolangmgr-private.lo: moolangmgr.lo
 mootextview-private.lo: mootextview.lo
 
-objc_sources =				\
-	mooedit-script.h		\
-	mooedit-script.m		\
-	moocommand-script.h		\
-	moocommand-script.m
+lua_sources =				\
+	moocommand-lua.c		\
+	moocommand-lua.h		\
+	mooedit-lua.c			\
+	mooedit-lua.h
 
 unix_sources =				\
 	moocommand-exe-unix.c
@@ -224,10 +224,10 @@ else
 EXTRA_DIST += $(unix_sources)
 endif
 
-if MOO_USE_OBJC
-mooedit_sources += $(objc_sources)
+if MOO_BUILD_LUA
+mooedit_sources += $(lua_sources)
 else
-EXTRA_DIST += $(objc_sources)
+EXTRA_DIST += $(lua_sources)
 endif
 
 noinst_LTLIBRARIES = libmooedit.la
diff --git a/moo/mooedit/menu.cfg b/moo/mooedit/menu.cfg
index 26227f90..623ed773 100644
--- a/moo/mooedit/menu.cfg
+++ b/moo/mooedit/menu.cfg
@@ -1,19 +1,20 @@
 # -%- strip: false -%-
-[tool]
-id = ShellCommand
-name = _Shell Command
-os = unix
-type = moo-script
-options = need-doc
-  cmd = HistoryEntry("", "ShellCommand");
-  if cmd then
-    Insert(Exec(cmd), "\n");
-  fi;
+#[tool]
+#id = ShellCommand
+#name = _Shell Command
+#os = unix
+#type = moo-script
+#options = need-doc
+#  cmd = HistoryEntry("", "ShellCommand");
+#  if cmd then
+#    Insert(Exec(cmd), "\n");
+#  fi;
 
 [tool]
 id = SortLines
 name = Sort Lines
 type = exe
+os = unix
 options = need-doc
 input = lines
 output = insert
@@ -23,6 +24,7 @@ output = insert
 id=Yacc
 langs=yacc
 type=exe
+os=unix
 name=Bison
 filter=bison
 options=need-save
@@ -33,6 +35,7 @@ output=pane
 id=LaTeX
 langs=latex
 type=exe
+os=unix
 name=LaTeX
 filter=latex
 options=need-save
@@ -44,6 +47,7 @@ accel=<shift><ctrl>L
 id=Make_PDF
 langs=latex
 type=exe
+os=unix
 name=Make PDF
 filter=latex
 options=need-save
@@ -56,6 +60,7 @@ output=pane
 id=Bibtex
 langs=latex
 type=exe
+os=unix
 name=Bibtex
 options=need-doc
 output=pane
@@ -66,6 +71,7 @@ accel=<shift><ctrl>B
 id=PdfLaTeX
 langs=latex
 type=exe
+os=unix
 name=PdfLaTeX
 filter=latex
 options=need-save
@@ -76,6 +82,7 @@ output=pane
 id=View_DVI
 langs=latex
 type=exe
+os=unix
 name=View DVI
 options=need-doc
 output=async
@@ -88,6 +95,7 @@ accel=<shift><ctrl>V
 id=View_PDF
 langs=latex
 type=exe
+os=unix
 name=View PDF
 options=need-doc
 output=async
@@ -101,18 +109,18 @@ output=async
   dcop "$kpdf" kpdf-mainwindow#1 hide
   dcop "$kpdf" kpdf-mainwindow#1 show
 
-[tool]
-id=Math
-langs=latex
-type=moo-script
-name=Math
-options=need-doc
-accel=<alt>M
-  selection = Selection();
-  if selection then
-    Insert('$' + selection + '$');
-  else
-    Insert('$ $');
-    Left();
-    Select(-1);
-  fi;
+#[tool]
+#id=Math
+#langs=latex
+#type=moo-script
+#name=Math
+#options=need-doc
+#accel=<alt>M
+#  selection = Selection();
+#  if selection then
+#    Insert('$' + selection + '$');
+#  else
+#    Insert('$ $');
+#    Left();
+#    Select(-1);
+#  fi;
diff --git a/moo/mooedit/moocommand.c b/moo/mooedit/moocommand.c
index ef2b3fc3..9c32c9ae 100644
--- a/moo/mooedit/moocommand.c
+++ b/moo/mooedit/moocommand.c
@@ -17,7 +17,7 @@
 
 #define MOOEDIT_COMPILATION
 #include "mooedit/moocommand-private.h"
-#include "mooedit/moocommand-script.h"
+#include "mooedit/moocommand-lua.h"
 #include "mooedit/moocommand-exe.h"
 #include "mooedit/moocommand-builtin.h"
 #include "mooedit/mooeditwindow.h"
@@ -1142,8 +1142,8 @@ _moo_command_init (void)
     if (!been_here)
     {
         g_type_class_unref (g_type_class_ref (MOO_TYPE_COMMAND_BUILTIN));
-#ifdef MOO_USE_OBJC
-        g_type_class_unref (g_type_class_ref (MOO_TYPE_COMMAND_SCRIPT));
+#ifdef MOO_BUILD_LUA
+        g_type_class_unref (g_type_class_ref (MOO_TYPE_COMMAND_LUA));
 #endif
 #ifndef __WIN32__
         g_type_class_unref (g_type_class_ref (MOO_TYPE_COMMAND_EXE));