diff -urp amtu-1.0.orig/configure.in amtu-1.0/configure.in
--- amtu-1.0.orig/configure.in	2005-06-08 16:50:00.155816448 -0400
+++ amtu-1.0/configure.in	2005-06-08 16:51:12.515816056 -0400
@@ -1,9 +1,18 @@
-AC_INIT(src/amtu.c)
+AC_REVISION($Revision: 1.3 $)dnl
 # AC_CANONICAL_SYSTEM is deprecated in the latest version of AUTOMAKE.
 # We aren't using the latest version so we'll keep using it
 #AC_CANONICAL_TARGET
+AC_INIT(src/amtu.c)
+AC_PREREQ(2.12)dnl
+AC_CONFIG_AUX_DIR(config)
+AC_CONFIG_SRCDIR(src/amtu.c)
+AM_CONFIG_HEADER(config.h)
+
+VERSION=1.0
+echo Configuring amtu $VERSION
+
 AC_CANONICAL_SYSTEM
-AM_INIT_AUTOMAKE(amtu, 1.0)
+AM_INIT_AUTOMAKE(amtu, $VERSION)
 AC_PROG_CC
 case "$target" in
 i386-* | i486-* | i586-* | i686-*) AC_DEFINE(HAVE_I86,1,NULL);;
@@ -15,6 +24,4 @@ ia64-*) AC_DEFINE(HAVE_IA64,1,NULL);;
 esac
 AC_CHECK_LIB(laus, laus_open)
 AC_CHECK_LIB(audit, audit_open)
-AC_OUTPUT(Makefile \
-src/Makefile \
-doc/Makefile)
+AC_OUTPUT(Makefile src/Makefile doc/Makefile)
diff -urp amtu-1.0.orig/src/amtu.c amtu-1.0/src/amtu.c
--- amtu-1.0.orig/src/amtu.c	2005-03-17 13:46:39.000000000 -0500
+++ amtu-1.0/src/amtu.c	2005-06-08 16:51:42.051325976 -0400
@@ -36,6 +36,7 @@
 //
 //----------------------------------------------------------------------
 
+#include "config.h"
 #include <stdlib.h>
 #include <stdio.h>
 #include <unistd.h>
diff -urp amtu-1.0.orig/src/amtu-i86.c amtu-1.0/src/amtu-i86.c
--- amtu-1.0.orig/src/amtu-i86.c	2005-03-17 13:48:38.000000000 -0500
+++ amtu-1.0/src/amtu-i86.c	2005-06-08 16:51:12.521815144 -0400
@@ -29,6 +29,7 @@
 //                    using libaudit instead of liblaus
 //----------------------------------------------------------------------
 
+#include "config.h"
 #include <stdlib.h>
 #include <stdio.h>
 #include <unistd.h>
diff -urp amtu-1.0.orig/src/amtu-ppc.c amtu-1.0/src/amtu-ppc.c
--- amtu-1.0.orig/src/amtu-ppc.c	2005-03-17 13:48:57.000000000 -0500
+++ amtu-1.0/src/amtu-ppc.c	2005-06-08 16:51:12.522814992 -0400
@@ -28,6 +28,7 @@
 //                    using libaudit instead of liblaus
 //----------------------------------------------------------------------
 
+#include "config.h"
 #include <stdlib.h>
 #include <stdio.h>
 #include <unistd.h>
diff -urp amtu-1.0.orig/src/amtu-s390.c amtu-1.0/src/amtu-s390.c
--- amtu-1.0.orig/src/amtu-s390.c	2005-03-17 13:49:16.000000000 -0500
+++ amtu-1.0/src/amtu-s390.c	2005-06-08 16:51:12.523814840 -0400
@@ -29,6 +29,7 @@
 //                    using libaudit instead of liblaus
 //----------------------------------------------------------------------
 
+#include "config.h"
 #include <stdlib.h>
 #include <stdio.h>
 #include <unistd.h>
diff -urp amtu-1.0.orig/src/iodisktest.c amtu-1.0/src/iodisktest.c
--- amtu-1.0.orig/src/iodisktest.c	2005-03-17 13:49:29.000000000 -0500
+++ amtu-1.0/src/iodisktest.c	2005-06-08 16:52:28.261300992 -0400
@@ -53,6 +53,7 @@
 //03/15/05 D.Velarde Added AUDIT_LOG statements to be used if we're
 //                   using libaudit instead of liblaus
 //----------------------------------------------------------------------
+#include "config.h"
 #include <stdlib.h>
 #include <stdio.h>
 #include <unistd.h>
diff -urp amtu-1.0.orig/src/memory.c amtu-1.0/src/memory.c
--- amtu-1.0.orig/src/memory.c	2005-03-17 13:49:41.000000000 -0500
+++ amtu-1.0/src/memory.c	2005-06-08 16:52:48.022296864 -0400
@@ -46,6 +46,7 @@
 //                     using libaudit instead of liblaus
 //
 //----------------------------------------------------------------------
+#include "config.h"
 #include <stdlib.h>
 #include <stdio.h>
 #include <errno.h>
diff -urp amtu-1.0.orig/src/memsep.c amtu-1.0/src/memsep.c
--- amtu-1.0.orig/src/memsep.c	2005-03-17 17:27:49.000000000 -0500
+++ amtu-1.0/src/memsep.c	2005-06-08 16:53:01.955178744 -0400
@@ -52,6 +52,7 @@
 //                   don't switch to user nobody if running on RHEL4
 //
 //----------------------------------------------------------------------
+#include "config.h"
 #include <stdlib.h>
 #include <stdio.h>
 #include <unistd.h>
diff -urp amtu-1.0.orig/src/networkio.c amtu-1.0/src/networkio.c
--- amtu-1.0.orig/src/networkio.c	2005-03-17 13:50:08.000000000 -0500
+++ amtu-1.0/src/networkio.c	2005-06-08 16:53:21.894147560 -0400
@@ -28,6 +28,7 @@
 //
 // -----------------------------------------------------------------
 
+#include "config.h"
 #include <stdio.h>
 #include <stdlib.h>
 #include <unistd.h>