diff --git a/configure.ac b/configure.ac
index de09cef6..0a2fbc17 100644
--- a/configure.ac
+++ b/configure.ac
@@ -285,6 +285,7 @@ toys/mug/Makefile
 toys/mug2/Makefile
 toys/muile/Makefile
 toys/procmule/Makefile
+toys/mm/Makefile
 man/Makefile
 m4/Makefile
 contrib/Makefile
diff --git a/toys/Makefile.am b/toys/Makefile.am
index dd3ddc90..2107b41f 100644
--- a/toys/Makefile.am
+++ b/toys/Makefile.am
@@ -1,4 +1,4 @@
-## Copyright (C) 2008-2010 Dirk-Jan C. Binnema <djcb@djcbsoftware.nl>
+## Copyright (C) 2008-2011 Dirk-Jan C. Binnema <djcb@djcbsoftware.nl>
 ##
 ## This program is free software; you can redistribute it and/or modify
 ## it under the terms of the GNU General Public License as published by
@@ -16,7 +16,7 @@
 
 include $(top_srcdir)/gtest.mk
 
-SUBDIRS=
+SUBDIRS=mm
 
 # build if there is some gtk available
 if HAVE_GTK
diff --git a/toys/mm/Makefile.am b/toys/mm/Makefile.am
new file mode 100644
index 00000000..a21f836d
--- /dev/null
+++ b/toys/mm/Makefile.am
@@ -0,0 +1,35 @@
+## Copyright (C) 2008-2011 Dirk-Jan C. Binnema <djcb@djcbsoftware.nl>
+##
+## This program 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.
+##
+## This program 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 this program; if not, write to the Free Software Foundation,
+## Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+
+include $(top_srcdir)/gtest.mk
+
+SUBDIRS=
+
+BUILT_SOURCES=mm-version.el
+
+mm-version.el:
+	@echo -e ";; auto-generated\n\
+(defconst mm/mu-version \"$(VERSION)\" \"Required mu binary version.\")\n\
+(provide 'mm-version)\n" >$@
+
+EXTRA_DIST=			\
+	mm.el			\
+	mm-hdrs.el		\
+	mm-view.el		\
+	mm-proc.el		\
+	mm-send.el		\
+	mm-version.el
+