diff --git a/ChangeLog b/ChangeLog
index accc4d7ae..df0c72613 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2005-08-09  David Shaw  <dshaw@jabberwocky.com>
+
+	* configure.ac: Remove hardcoded -I and -L for /usr/local on
+	FreeBSD.
+
 2005-08-04  David Shaw  <dshaw@jabberwocky.com>
 
 	* configure.ac: Call GNUPG_CHECK_USTAR and generate tools/gpg-zip.
diff --git a/configure.ac b/configure.ac
index 5e6c6997c..517e05d8d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -495,12 +495,6 @@ case "${host}" in
         agent_support=no
         ;;
 
-    *-*-freebsd*)
-       # FreeBSD
-       CPPFLAGS="$CPPFLAGS -I/usr/local/include"
-       LDFLAGS="$LDFLAGS -L/usr/local/lib"
-       ;;
-
     *-*-hpux*)
         if test -z "$GCC" ; then
             CFLAGS="$CFLAGS -Ae -D_HPUX_SOURCE"