diff --git a/Makefile.am b/Makefile.am
index b955f8a..c8c7771 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -15,3 +15,5 @@ ssh2_sample_SOURCES = ssh2_sample.c
 ssh2_sample_LDADD = src/libssh2.la
 
 EXTRA_DIST = LICENSE win32
+
+ACLOCAL_AMFLAGS = -I m4
diff --git a/configure.in b/configure.in
index 69c023e..99c8e3b 100644
--- a/configure.in
+++ b/configure.in
@@ -3,6 +3,7 @@ AC_INIT(libssh2, 0.15, libssh2-devel@lists.sourceforge.net)
 AM_INIT_AUTOMAKE(libssh2, 0.15)
 AC_CONFIG_SRCDIR([src])
 AC_CONFIG_HEADER([src/libssh2_config.h])
+AB_INIT
 
 # Check for the OS.
 # Daniel's note: this should not be necessary and we need to work to
diff --git a/m4/autobuild.m4 b/m4/autobuild.m4
new file mode 100644
index 0000000..2f94844
--- /dev/null
+++ b/m4/autobuild.m4
@@ -0,0 +1,44 @@
+# autobuild.m4 serial 3
+# Copyright (C) 2004, 2006 Simon Josefsson
+#
+# This file is free software, distributed under the terms of the GNU
+# General Public License.  As a special exception to the GNU General
+# Public License, this file may be distributed as part of a program
+# that contains a configuration script generated by Autoconf, under
+# the same distribution terms as the rest of that program.
+#
+# This file can can be used in projects which are not available under
+# the GNU General Public License or the GNU Library General Public
+# License but which still want to provide support for Autobuild.
+
+# Usage: AB_INIT([MODE]).
+AC_DEFUN([AB_INIT],
+[
+	AC_REQUIRE([AC_CANONICAL_BUILD])
+	AC_REQUIRE([AC_CANONICAL_HOST])
+
+	if test -z "$AB_PACKAGE"; then
+	   AB_PACKAGE=${PACKAGE_NAME:-$PACKAGE}
+	fi
+	AC_MSG_NOTICE([autobuild project... $AB_PACKAGE])
+
+	if test -z "$AB_VERSION"; then
+	   AB_VERSION=${PACKAGE_VERSION:-$VERSION}
+	fi
+	AC_MSG_NOTICE([autobuild revision... $AB_VERSION])
+
+	hostname=`hostname`
+	if test "$hostname"; then
+	   AC_MSG_NOTICE([autobuild hostname... $hostname])
+	fi
+
+	ifelse([$1],[],,[AC_MSG_NOTICE([autobuild mode... $1])])
+
+	date=`date +%Y%m%d-%H%M%S`
+	if test "$?" != 0; then
+	   date=`date`
+	fi
+	if test "$date"; then
+	   AC_MSG_NOTICE([autobuild timestamp... $date])
+	fi
+])