diff --git a/.gitignore b/.gitignore
index 3aa3e92..88a0f10 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,6 +2,7 @@ CVS/
 Makefile
 config.h
 *.o
-bgpq3
+bgpq4
 config.log
 config.status
+autom4te.cache
diff --git a/bootstrap b/bootstrap
new file mode 100755
index 0000000..0c04be3
--- /dev/null
+++ b/bootstrap
@@ -0,0 +1,7 @@
+#!/bin/bash
+#
+# Script to help bootstrap the build system when checked out from git
+#
+set -auxo pipefail
+
+autoreconf -i
diff --git a/config.h.in b/config.h.in
index 4235374..3a24948 100644
--- a/config.h.in
+++ b/config.h.in
@@ -1,4 +1,4 @@
-/* config.h.in.  Generated from configure.in by autoheader.  */
+/* config.h.in.  Generated from configure.ac by autoheader.  */
 
 /* Define to 1 if you have the <inttypes.h> header file. */
 #undef HAVE_INTTYPES_H
diff --git a/configure b/configure
index f24e99c..d6d84bc 100755
--- a/configure
+++ b/configure
@@ -1,8 +1,8 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for bgpq4 0.1.35.
+# Generated by GNU Autoconf 2.69 for bgpq4 0.0.2.
 #
-# Report bugs to job@ntt.net
+# Report bugs to <job@ntt.net>.
 #
 #
 # Copyright (C) 1992-1996, 1998-2012 Free Software Foundation, Inc.
@@ -266,11 +266,10 @@ fi
     $as_echo "$0: In particular, zsh $ZSH_VERSION has bugs and should"
     $as_echo "$0: be upgraded to zsh 4.3.4 or later."
   else
-    $as_echo "$0: Please tell bug-autoconf@gnu.org and snar@snar.spb.ru
-$0: about your system, including any error possibly output
-$0: before this message. Then install a modern shell, or
-$0: manually run the script under such a shell if you do
-$0: have one."
+    $as_echo "$0: Please tell bug-autoconf@gnu.org and job@ntt.net about
+$0: your system, including any error possibly output before
+$0: this message. Then install a modern shell, or manually
+$0: run the script under such a shell if you do have one."
   fi
   exit 1
 fi
@@ -583,7 +582,7 @@ PACKAGE_TARNAME='bgpq4'
 PACKAGE_VERSION='0.0.2'
 PACKAGE_STRING='bgpq4 0.0.2'
 PACKAGE_BUGREPORT='job@ntt.net'
-PACKAGE_URL='https://github.com/bgp/bgpq4'
+PACKAGE_URL=''
 
 # Factoring default headers for most tests.
 ac_includes_default="\
@@ -1228,7 +1227,7 @@ if test "$ac_init_help" = "long"; then
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures bgpq4 0.1.35 to adapt to many kinds of systems.
+\`configure' configures bgpq4 0.0.2 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1289,7 +1288,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of bgpq4 0.1.35:";;
+     short | recursive ) echo "Configuration of bgpq4 0.0.2:";;
    esac
   cat <<\_ACEOF
 
@@ -1369,7 +1368,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-bgpq4 configure 0.1.35
+bgpq4 configure 0.0.2
 generated by GNU Autoconf 2.69
 
 Copyright (C) 2012 Free Software Foundation, Inc.
@@ -1528,9 +1527,9 @@ $as_echo "$as_me: WARNING: $2: see the Autoconf documentation" >&2;}
 $as_echo "$as_me: WARNING: $2:     section \"Present But Cannot Be Compiled\"" >&2;}
     { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: proceeding with the compiler's result" >&5
 $as_echo "$as_me: WARNING: $2: proceeding with the compiler's result" >&2;}
-( $as_echo "## ------------------------------- ##
-## Report this to snar@snar.spb.ru ##
-## ------------------------------- ##"
+( $as_echo "## -------------------------- ##
+## Report this to job@ntt.net ##
+## -------------------------- ##"
      ) | sed "s/^/$as_me: WARNING:     /" >&2
     ;;
 esac
@@ -1738,7 +1737,7 @@ cat >config.log <<_ACEOF
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by bgpq4 $as_me 0.1.35, which was
+It was created by bgpq4 $as_me 0.0.2, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   $ $0 $@
@@ -2086,6 +2085,7 @@ ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $
 ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
 
+
 ac_config_headers="$ac_config_headers config.h"
 
 ac_ext=c
@@ -4102,7 +4102,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by bgpq4 $as_me 0.1.35, which was
+This file was extended by bgpq4 $as_me 0.0.2, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -4158,7 +4158,7 @@ $config_files
 Configuration headers:
 $config_headers
 
-Report bugs to <snar@snar.spb.ru>."
+Report bugs to <job@ntt.net>."
 
 _ACEOF
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
diff --git a/configure.in b/configure.ac
similarity index 93%
rename from configure.in
rename to configure.ac
index ed584b4..f215e85 100644
--- a/configure.in
+++ b/configure.ac
@@ -1,4 +1,5 @@
 AC_INIT(bgpq4,0.0.2,job@ntt.net)
+AC_PACKAGE_URL(https://github.com/bgp/bgpq4)
 AC_CONFIG_HEADER(config.h)
 AC_PROG_CC
 AC_PROG_INSTALL