diff --git a/.cvsignore b/.cvsignore
index c548825..86c5c41 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -6,3 +6,4 @@ amtu-1.0.3.tar.gz
 amtu-1.0.4.tar.gz
 amtu-1.0.5-1.tar.gz
 amtu-1.0.6.tar.gz
+amtu-1.0.7.tar.gz
diff --git a/amtu-1.0.7-makefile.patch b/amtu-1.0.7-makefile.patch
new file mode 100644
index 0000000..ee865e7
--- /dev/null
+++ b/amtu-1.0.7-makefile.patch
@@ -0,0 +1,78 @@
+diff -ur amtu-1.0.7.orig/configure.in amtu-1.0.7/configure.in
+--- amtu-1.0.7.orig/configure.in	2009-07-01 10:29:09.000000000 -0400
++++ amtu-1.0.7/configure.in	2009-07-01 11:05:07.000000000 -0400
+@@ -1,19 +1,14 @@
+-AC_REVISION($Revision: 1.2 $)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_REVISION($Revision: 1.3 $)dnl
++AC_INIT(amtu,1.0.7)
+ AC_PREREQ(2.12)dnl
+-AC_CONFIG_AUX_DIR(config)
+-AC_CONFIG_SRCDIR(src/amtu.c)
+ AM_CONFIG_HEADER(config.h)
+ 
+-VERSION=1.0.6
+-echo Configuring amtu $VERSION
+-
+-AC_CANONICAL_SYSTEM
+-AM_INIT_AUTOMAKE(amtu, $VERSION)
++AC_CANONICAL_TARGET
++AM_INIT_AUTOMAKE
+ AC_PROG_CC
++AC_PROG_INSTALL
++AC_PROG_AWK
++
+ case "$target" in
+ i386-* | i486-* | i586-* | i686-*) AC_DEFINE(HAVE_I86,1,NULL);;
+ powerpc-*) AC_DEFINE(HAVE_PPC,1,NULL);;
+@@ -25,3 +20,15 @@
+ AC_CHECK_LIB(laus, laus_open)
+ AC_CHECK_LIB(audit, audit_open)
+ AC_OUTPUT(Makefile src/Makefile doc/Makefile)
++
++echo .
++echo "
++
++  amtu:                   $VERSION
++  Target:                 $target
++  Installation prefix:    $prefix
++  Compiler:               $CC
++  Compiler flags:
++`echo $CFLAGS | fmt -w 50 | sed 's,^,                          ,'`
++"
++
+diff -ur amtu-1.0.7.orig/doc/Makefile.am amtu-1.0.7/doc/Makefile.am
+--- amtu-1.0.7.orig/doc/Makefile.am	2009-07-01 10:29:09.000000000 -0400
++++ amtu-1.0.7/doc/Makefile.am	2009-07-01 10:56:52.000000000 -0400
+@@ -1 +1,3 @@
++CONFIG_CLEAN_FILES = *.rej *.orig
++EXTRA_DIST = $(man_MANS)
+ man_MANS = amtu.8
+diff -ur amtu-1.0.7.orig/Makefile.am amtu-1.0.7/Makefile.am
+--- amtu-1.0.7.orig/Makefile.am	2009-07-01 10:29:09.000000000 -0400
++++ amtu-1.0.7/Makefile.am	2009-07-01 10:36:48.000000000 -0400
+@@ -1 +1,8 @@
+ SUBDIRS = src doc
++EXTRA_DIST = bootstrap LICENSE CPLv1.0.htm README
++CONFIG_CLEAN_FILES = debug*.list config/*
++
++clean-generic:
++	rm -rf autom4te*.cache 
++	rm -f *.rej *.orig
++
+diff -ur amtu-1.0.7.orig/src/Makefile.am amtu-1.0.7/src/Makefile.am
+--- amtu-1.0.7.orig/src/Makefile.am	2009-07-01 10:29:09.000000000 -0400
++++ amtu-1.0.7/src/Makefile.am	2009-07-01 10:55:44.000000000 -0400
+@@ -1,3 +1,8 @@
+-AM_CPPFLAGS  = -Wall -W -Wfloat-equal -Wundef
++CLEANFILES = $(BUILT_SOURCES)
++CONFIG_CLEAN_FILES = *.loT *.rej *.orig
++AM_CFLAGS  = -Wall -W -Wfloat-equal -Wundef
++INCLUDES = -I. -I${top_srcdir}
++noinst_HEADERS = amtu.h
+ bin_PROGRAMS = amtu
+ amtu_SOURCES = amtu-i86.c amtu-ppc.c amtu-s390.c amtu-ia64.c amtu.c memory.c memsep.c iodisktest.c networkio.c
++amtu_DEPENDENCIES = $(amtu_SOURCES) ${top_srcdir}/config.h
diff --git a/amtu.spec b/amtu.spec
index 81caf27..0b91287 100644
--- a/amtu.spec
+++ b/amtu.spec
@@ -1,11 +1,12 @@
 Summary: Abstract Machine Test Utility (AMTU)
 Name: amtu 
-Version: 1.0.6
-Release: 4%{?dist}
+Version: 1.0.7
+Release: 1%{?dist}
 License: CPL
 Group: System Environment/Base
 URL: http://sourceforge.net/projects/amtueal/
 Source0: %{name}-%{version}.tar.gz
+Patch1: amtu-1.0.7-makefile.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: audit-libs-devel >= 1.1.2
 BuildRequires: automake
@@ -22,19 +23,9 @@ http://www.radium.ncsc.mil/tpep/library/protection_profiles/CAPP-1.d.pdf
 
 %prep
 %setup -q
+%patch1 -p1
 
 %build
-# Determine appropriate compiler
-CC="gcc"
-%ifarch ppc64 ppc64iseries ppc64pseries
-  CC="/usr/bin/ppc64-redhat-linux-gcc"
-%endif
-# Determine appropriate compiler flags
-CFLAGS="$RPM_OPT_FLAGS -D_GNU_SOURCE -Wall -pipe"
-%ifarch x86_64
-  CFLAGS="$RPM_OPT_FLAGS -D_GNU_SOURCE -Wall -pipe -m64"
-%endif
-export CC CFLAGS
 # next 3 items is to quieten autoreconf
 touch ChangeLog
 touch NEWS
@@ -45,22 +36,21 @@ make %{?_smp_mflags}
 
 %install
 rm -rf $RPM_BUILD_ROOT
-mkdir -p $RPM_BUILD_ROOT/%{_bindir}
-install -m 0750 src/amtu $RPM_BUILD_ROOT/%{_bindir}
-
-mkdir -p $RPM_BUILD_ROOT/%{_mandir}/man8/
-install -m 644 doc/amtu.8 $RPM_BUILD_ROOT/%{_mandir}/man8/amtu.8
+make "DESTDIR=${RPM_BUILD_ROOT}" install
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %files
-%defattr(-,root,root)
+%defattr(-,root,root, -)
 %doc doc/AMTUHowTo.txt COPYING
 %attr(0750,root,root) %{_bindir}/amtu
 %attr(0644,root,root) %{_mandir}/man8/*
 
 %changelog
+* Wed Jul 01 2009 Steve Grubb <sgrubb@redhat.com> 1.0.7-1
+- new upstream version
+
 * Mon Feb 23 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.0.6-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 
diff --git a/sources b/sources
index 94fc11b..462d897 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-9c65ae295bb875bb4aa8786e17a2f1e7  amtu-1.0.6.tar.gz
+8858a47c667ffc4af840d72d8ced6605  amtu-1.0.7.tar.gz