diff --git a/Makefile.am b/Makefile.am
index ded6a38..a5697b9 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -31,4 +31,4 @@
 ACLOCAL_AMFLAGS = -I m4
 
 # Subdirectories to recurse into
-SUBDIRS = lib src doc
+SUBDIRS = lib src doc m4
diff --git a/configure.ac b/configure.ac
index 2f82309..db59b99 100644
--- a/configure.ac
+++ b/configure.ac
@@ -26,7 +26,7 @@ dnl You should have received a copy of the GNU General Public License
 dnl along with this program.  If not, see http://www.gnu.org/licenses/.
 
 
-AC_INIT([Star Traders], [7.0], [J.Zaitseff@zap.org.au], , [http://www.zap.org.au/software/trader/])
+AC_INIT([Star Traders], [7.0], [J.Zaitseff@zap.org.au], [trader], [http://www.zap.org.au/software/trader/])
 
 AC_CONFIG_AUX_DIR([build-aux])
 AM_INIT_AUTOMAKE([-Wall -Werror foreign])
@@ -39,5 +39,6 @@ AC_CONFIG_FILES([
 	src/Makefile
 	lib/Makefile
 	doc/Makefile
+	m4/Makefile
 ])
 AC_OUTPUT
diff --git a/m4/Makefile.am b/m4/Makefile.am
new file mode 100644
index 0000000..fd16f20
--- /dev/null
+++ b/m4/Makefile.am
@@ -0,0 +1,27 @@
+#########################################################################
+#                                                                       #
+#             Star Traders: A Game of Interstellar Trading              #
+#                Copyright (C) 1990-2011, John Zaitseff                 #
+#                                                                       #
+#########################################################################
+
+# Author: John Zaitseff <J.Zaitseff@zap.org.au>
+# $Id$
+#
+# This file, m4/Makefile.am, contains the m4 macro directory Makefile for
+# Star Traders.  It needs to be processed by automake to produce the
+# corresponding Makefile.in.
+#
+#
+# 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, see http://www.gnu.org/licenses/.