diff --git a/ChangeLog b/ChangeLog
index 194267b75..71e1622ac 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2002-10-25  Mirko Viviani  <mirko.viviani@rccr.cremona.it>
+
+	* configure.ac: fixed header/ldflags for freebsd.
+
 2002-10-21  Adam Fedor  <fedor@gnu.org>
 
 	* Source/GSFontInfo.m (+encodingForRegistry:encoding:): Remove.
diff --git a/configure b/configure
index e240f68f2..71b7306da 100755
--- a/configure
+++ b/configure
@@ -1341,8 +1341,8 @@ LDFLAGS="$LDFLAGS -L$GNUSTEP_LDIR/$LIBRARY_COMBO -L$GNUSTEP_LDIR"
 # Add target OS directories as necessary
 #--------------------------------------------------------------------
 case "$target_os" in
-  freebsd*)   CPPFLAGS="$CPPFLAGS -I/usr/pkg/include"
-              LDFLAGS="$LDFLAGS -L/usr/pkg/lib";;
+  freebsd*)   CPPFLAGS="$CPPFLAGS -I/usr/local/include"
+              LDFLAGS="$LDFLAGS -L/usr/local/lib";;
   netbsd*)    CPPFLAGS="$CPPFLAGS -I/usr/pkg/include"
               LDFLAGS="$LDFLAGS -L/usr/pkg/lib";;
 esac
diff --git a/configure.ac b/configure.ac
index 44662a4fa..bd155cabd 100644
--- a/configure.ac
+++ b/configure.ac
@@ -62,8 +62,8 @@ LDFLAGS="$LDFLAGS -L$GNUSTEP_LDIR/$LIBRARY_COMBO -L$GNUSTEP_LDIR"
 # Add target OS directories as necessary
 #--------------------------------------------------------------------
 case "$target_os" in
-  freebsd*)   CPPFLAGS="$CPPFLAGS -I/usr/pkg/include"
-              LDFLAGS="$LDFLAGS -L/usr/pkg/lib";;
+  freebsd*)   CPPFLAGS="$CPPFLAGS -I/usr/local/include"
+              LDFLAGS="$LDFLAGS -L/usr/local/lib";;
   netbsd*)    CPPFLAGS="$CPPFLAGS -I/usr/pkg/include"
               LDFLAGS="$LDFLAGS -L/usr/pkg/lib";;
 esac