diff --git a/Makefile.am b/Makefile.am
index 81ea5e99..e519792f 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -58,8 +58,8 @@ mooutils_include_HEADERS = $(mooutils_include_headers)
 CLEANFILES = $(moo_cleanfiles)
 
 if !MOO_OS_CYGWIN
-libmoo_1_0_la_LDFLAGS  = -version-info $(LTVERSION) -export-symbols-regex "^[^_].*" -no-undefined
-libmoo_1_0_la_SOURCES = $(moo_built_sources) $(moo_sources)
+libmoo_1_0_la_LDFLAGS = -version-info $(LTVERSION) -export-symbols-regex "^[^_].*" -no-undefined
+libmoo_1_0_la_SOURCES = $(moo_sources)
 BUILT_SOURCES = $(moo_built_sources)
 nodist_libmoo_1_0_la_SOURCES = $(moo_nodist_sources)
 if MOO_OS_MINGW
@@ -76,3 +76,28 @@ $(moo_win32_sources)     \
 $(moo_unix_sources)      \
 $(moo_built_sources)     \
 $(moo_extra_dist)
+
+
+##############################################################################
+# moo module
+#
+if BUILD_PYMOO
+
+pyexec_LTLIBRARIES = moo.la
+
+moo_la_SOURCES = $(libmoo_1_0_la_SOURCES)
+nodist_moo_la_SOURCES = $(nodist_libmoo_1_0_la_SOURCES)
+
+if MOO_OS_MINGW
+mingw_flags = -no-undefined
+endif MOO_OS_MINGW
+
+moo_la_LDFLAGS = -module -avoid-version -no-undefined -export-symbols-regex "initmoo"
+
+moo_la_LIBADD =         \
+    $(GTK_LIBS)         \
+    $(XML_LIBS)         \
+    $(PYTHON_LDFLAGS)   \
+    $(PYTHON_EXTRA_LIBS)
+
+endif BUILD_PYMOO
diff --git a/moo.kdevelop b/moo.kdevelop
index 5bc43302..0736b475 100644
--- a/moo.kdevelop
+++ b/moo.kdevelop
@@ -24,7 +24,7 @@
     </ignoreparts>
     <projectdirectory>.</projectdirectory>
     <absoluteprojectpath>false</absoluteprojectpath>
-    <description/>
+    <description></description>
     <secondaryLanguages>
       <language>C</language>
     </secondaryLanguages>
@@ -54,13 +54,13 @@
         <cflags>-O0 -g3 -pg</cflags>
         <cxxflags>-O0 -g3 -pg</cxxflags>
         <envvars/>
-        <topsourcedir/>
-        <cppflags/>
-        <ldflags/>
-        <ccompilerbinary/>
-        <cxxcompilerbinary/>
-        <f77compilerbinary/>
-        <f77flags/>
+        <topsourcedir></topsourcedir>
+        <cppflags></cppflags>
+        <ldflags></ldflags>
+        <ccompilerbinary></ccompilerbinary>
+        <cxxcompilerbinary></cxxcompilerbinary>
+        <f77compilerbinary></f77compilerbinary>
+        <f77flags></f77flags>
       </debug>
       <gtk-cvs>
         <configargs>--enable-debug=full --enable-all-gcc-warnings=fatal --enable-developer-mode --disable-moo-module --without-python --without-mooterm --without-mooapp</configargs>
@@ -200,10 +200,10 @@
     <general>
       <dbgshell>libtool</dbgshell>
       <programargs>--g-fatal-warnings </programargs>
-      <gdbpath/>
-      <configGdbScript/>
-      <runShellScript/>
-      <runGdbScript/>
+      <gdbpath></gdbpath>
+      <configGdbScript></configGdbScript>
+      <runShellScript></runShellScript>
+      <runGdbScript></runGdbScript>
       <breakonloadinglibs>true</breakonloadinglibs>
       <separatetty>false</separatetty>
       <floatingtoolbar>true</floatingtoolbar>
@@ -268,16 +268,16 @@
   </kdevdoctreeview>
   <kdevfilecreate>
     <filetypes>
-      <type icon="source" ext="g" create="template" name="GAP source" >
+      <type icon="source" ext="g" name="GAP source" create="template" >
         <descr>A new empty GAP source file</descr>
       </type>
-      <type icon="source_cpp" ext="cpp" create="template" name="C++ Source" >
+      <type icon="source_cpp" ext="cpp" name="C++ Source" create="template" >
         <descr>A new empty C++ file.</descr>
       </type>
-      <type icon="source_h" ext="h" create="template" name="C/C++ Header" >
+      <type icon="source_h" ext="h" name="C/C++ Header" create="template" >
         <descr>A new empty header file for C/C++.</descr>
       </type>
-      <type icon="source_c" ext="c" create="template" name="C Source" >
+      <type icon="source_c" ext="c" name="C Source" create="template" >
         <descr>A new empty C file.</descr>
       </type>
     </filetypes>
@@ -304,7 +304,7 @@
     </codecompletion>
     <references/>
     <creategettersetter>
-      <prefixGet/>
+      <prefixGet></prefixGet>
       <prefixSet>set</prefixSet>
       <prefixVariable>m_,_</prefixVariable>
       <parameterName>theValue</parameterName>
diff --git a/moo/mooterm/Makefile.incl b/moo/mooterm/Makefile.incl
index 8d2524bf..3071c510 100644
--- a/moo/mooterm/Makefile.incl
+++ b/moo/mooterm/Makefile.incl
@@ -47,6 +47,8 @@ mooterm_sources =                             \
     $(mooterm)/mootermline-private.h          \
     $(mooterm)/mootermparser.c                \
     $(mooterm)/mootermparser.h                \
+    $(mooterm)/mootermparser-yacc.c           \
+    $(mooterm)/mootermparser-yacc.h           \
     $(mooterm)/mootermpt.c                    \
     $(mooterm)/mootermpt.h                    \
     $(mooterm)/mootermpt-private.h            \
@@ -91,7 +93,7 @@ $(mooterm)/mootermprefs-glade.h: $(mooterm)/glade/mootermprefs.glade
 		> $(mooterm)/mootermprefs-glade.h
 
 
-moo_sources += $(mooterm_sources) $(mooterm_built_sources)
+moo_sources += $(mooterm_sources)
 moo_unix_sources += $(mooterm_unix_sources)
 moo_win32_sources += $(mooterm_win32_sources)
 moo_built_sources += $(mooterm_built_sources)