diff --git a/ChangeLog b/ChangeLog
index 8c51a962a5..ca9c1180ba 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Wed Feb  7 11:30:14 EST 2007 Daniel Berrange <berrange@redhat.com>
+
+	* autobuild.sh, src/Makefile.am: Added a control file for
+	automating build and test processes
+
 Wed Feb  7 07:43:21 EST 2007 Daniel Berrange <berrange@redhat.com>
 
 	* src/xml.c, tests/xml2sexprdata/*.sexpr: Also include the
diff --git a/Makefile.am b/Makefile.am
index d25d514b30..dcc80679d5 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -6,7 +6,7 @@ ACLOCAL_AMFLAGS = -I m4
 
 EXTRA_DIST = libvirt.spec.in libvirt.spec COPYING.LIB \
              libvirt.pc.in libvirt.pc TODO AUTHORS ChangeLog \
-	     NEWS README $(man_MANS)
+	     NEWS README $(man_MANS) autobuild.sh
 
 man_MANS = virsh.1
 
diff --git a/autobuild.sh b/autobuild.sh
new file mode 100755
index 0000000000..2c23e62dca
--- /dev/null
+++ b/autobuild.sh
@@ -0,0 +1,35 @@
+#!/bin/sh
+
+set -e
+
+# Make things clean.
+
+test -n "$1" && RESULTS="$1" || RESULTS="results.log"
+
+test -f Makefile && make -k distclean || :
+rm -rf MANIFEST blib
+
+#rm -rf build
+#mkdir build
+#cd build
+
+./autogen.sh --prefix=$AUTOBUILD_INSTALL_ROOT
+
+make
+make install
+
+make check 1>$RESULTS 2>&1
+#make cov
+
+rm -f *.tar.gz
+make dist
+
+if [ -f /usr/bin/rpmbuild ]; then
+  if [ -n "$AUTOBUILD_COUNTER" ]; then
+    EXTRA_RELEASE=".auto$AUTOBUILD_COUNTER"
+  else
+    NOW=`date +"%s"`
+    EXTRA_RELEASE=".$USER$NOW"
+  fi
+  rpmbuild --nodeps --define "extra_release $EXTRA_RELEASE" -ta --clean *.tar.gz
+fi