diff --git a/ChangeLog b/ChangeLog
index 9565ed9029..970adb209a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2005-08-16  Dan Williams  <dcbw@redhat.com>
+
+	Patch from j@bootlab.org
+	* vpn-daemons/vpnc/Makefile.am: Fix for autoreconf
+
+	* configure.in: allow specifying the path to dhcdbd
+
 2005-08-16  Robert Love  <rml@novell.com>
 
 	Patch from j@bootlab.org
diff --git a/configure.in b/configure.in
index ab5ea2e3d9..b5db42f135 100644
--- a/configure.in
+++ b/configure.in
@@ -197,9 +197,12 @@ AC_DEFINE_UNQUOTED(NM_NAMED_BINARY_PATH, "$with_named", [Define to path of named
 AC_DEFINE_UNQUOTED(NM_NAMED_DATA_DIR, "$with_named_dir", [Define to path of named data directory])
 AC_DEFINE_UNQUOTED(NM_NAMED_USER, "$with_named_user", [Define to named username])
 
-AC_PATH_PROG(DHCDBD_BINARY_PATH, dhcdbd, [], $PATH:/sbin:/usr/sbin)
-if ! test -x "$DHCDBD_BINARY_PATH"; then
+AC_ARG_WITH(DHCDBD_BINARY_PATH, AC_HELP_STRING([--with-dhcdbd=/path/to/dhcdbd], [path to dhcdbd])) 
+if test "x${DHCDBD_BINARY_PATH}" = x; then
+  AC_PATH_PROG(DHCDBD_BINARY_PATH, dhcdbd, [], $PATH:/sbin:/usr/sbin)
+  if ! test -x "$DHCDBD_BINARY_PATH"; then
 	AC_MSG_ERROR(dhcdbd was not installed.  See http://people.redhat.com/jvdias/dhcdbd)
+  fi
 fi
 AC_SUBST(DHCDBD_BINARY_PATH)
 
diff --git a/vpn-daemons/vpnc/Makefile.am b/vpn-daemons/vpnc/Makefile.am
index 51bb5b6bed..8e2b450044 100644
--- a/vpn-daemons/vpnc/Makefile.am
+++ b/vpn-daemons/vpnc/Makefile.am
@@ -1,3 +1,5 @@
+AUTOMAKE_OPTIONS = foreign
+
 SUBDIRS = src auth-dialog properties po
 
 dbusservicedir = $(sysconfdir)/dbus-1/system.d