diff --git a/ChangeLog b/ChangeLog
index 392cf8f9e..9a214e109 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2002-08-15  Adam Fedor  <fedor@gnu.org>
+
+	* configure.ac: Add OpenBSD header/ldflag support (Patch from
+	Peter Cooper).
+
 2002-08-15  Richard Frith-Macdonald <rfm@gnu.org>
 
 	* SSL/GNUmakefile: Added -lgnustep-base and -lobjc to SSL_BUNDLE_LIBS
diff --git a/configure.ac b/configure.ac
index 162cfa337..2fe4dca0f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -62,7 +62,9 @@ AC_PATH_PROG(WHOAMI, whoami, echo, $PATH:/usr/ucb)
 #--------------------------------------------------------------------
 case "$target_os" in
   freebsd*)	CPPFLAGS="$CPPFLAGS -I/usr/local/include"
-		LIBS="$LIBS -L/usr/local/lib";;
+		LDFLAGS="$LDFLAGS -L/usr/local/lib";;
+  netbsd*)	CPPFLAGS="$CPPFLAGS -I/usr/pkg/include"
+		LDFLAGS="$LDFLAGS -L/usr/pkg/lib";;
 
 esac
 
@@ -363,7 +365,7 @@ if test $ac_cv_sizeof_long = 4; then
 else
   if test $ac_cv_sizeof_long = 8; then
     _GSC_S_LNG=_GSC_I64
-  else
+v  else
     if test $ac_cv_sizeof_long = 16; then
       _GSC_S_LNG=_GSC_I128
     fi