diff --git a/AUTHORS b/AUTHORS
index a761abe7d4..ff0664d2ed 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -1983,6 +1983,7 @@ And assorted fixes and enhancements by the people listed above and by:
 	Arsen Chaloyan <achaloyan [AT] yahoo.com>
 	<melerski [AT] poczta.onet.pl>
 	Arnaud Jacques <webmaster [AT] securiteinfo.com>
+	D. Manzella <manzella [AT] lucent.com>
 
 Alain Magloire <alainm[AT]rcsm.ece.mcgill.ca> was kind enough to
 give his permission to use his version of snprintf.c.
diff --git a/configure.in b/configure.in
index b19c9bc46e..7439420eed 100644
--- a/configure.in
+++ b/configure.in
@@ -1,4 +1,4 @@
-# $Id: configure.in,v 1.236 2003/12/13 18:05:48 gerald Exp $
+# $Id: configure.in,v 1.237 2003/12/16 23:00:33 guy Exp $
 dnl
 dnl Process this file with autoconf 2.13 or later to produce a
 dnl configure script; 2.12 doesn't generate a "configure" script that
@@ -659,11 +659,20 @@ if test "x$NETSNMPCONFIG" != "xno" -a "x$NETSNMPCONFIG" != "x" -a -x "$NETSNMPCO
 	dnl other choices for flags to use here: could also use
 	dnl --prefix or --exec-prefix if you don't want the full list.
 
+	#
+	# Save the current settings of CFLAGS and CPPFLAGS, and add
+	# the output of "$NETSNMPCONFIG --cflags" to it, so that when
+	# searching for the Net-SNMP headers, we look in whatever
+	# directory that output specifies.
+	#
+	ethereal_save_CFLAGS="$CFLAGS"
+	ethereal_save_CPPFLAGS="$CPPFLAGS"
+	CFLAGS="$CFLAGS `$NETSNMPCONFIG --cflags`"
+	CPPFLAGS="$CPPFLAGS `$NETSNMPCONFIG --cflags`"
+
 	AC_CHECK_HEADERS(net-snmp/net-snmp-config.h net-snmp/library/default_store.h)
 	if test "x$ac_cv_header_net_snmp_net_snmp_config_h" = "xyes" -a "x$ac_cv_header_net_snmp_library_default_store_h" = "xyes" ; then
-		CFLAGS="$CFLAGS `net-snmp-config --cflags`"
-		CPPFLAGS="$CPPLAGS `net-snmp-config --cflags`"
-		SNMP_LIBS=`net-snmp-config --libs`
+		SNMP_LIBS=`$NETSNMPCONFIG --libs`
 		AC_DEFINE(HAVE_NET_SNMP, 1, [Define to enable support for NET-SNMP])
 		have_net_snmp="yes"
 	else
@@ -673,6 +682,14 @@ if test "x$NETSNMPCONFIG" != "xno" -a "x$NETSNMPCONFIG" != "x" -a -x "$NETSNMPCO
 		# headers.  This would likely be a broken system to
 		# try and use anyway.
 		NETSNMPCONFIG="no"
+
+		#
+		# Restore the versions of CFLAGS and CPPFLAGS before
+		# we added the output of '$NETSNMPCONFIG --cflags",
+		# as we didn't actually find Net-SNMP there.
+		#
+		CFLAGS="$ethereal_save_CFLAGS"
+		CPPFLAGS="$ethereal_save_CPPFLAGS"
 	fi	
 else
 	AC_MSG_CHECKING(whether to use UCD SNMP library if available)
diff --git a/doc/ethereal.pod b/doc/ethereal.pod
index 645ccf15c1..26f33b5aa0 100644
--- a/doc/ethereal.pod
+++ b/doc/ethereal.pod
@@ -2101,6 +2101,7 @@ B<http://www.ethereal.com>.
   Arsen Chaloyan           <achaloyan [AT] yahoo.com>
                            <melerski [AT] poczta.onet.pl>
   Arnaud Jacques           <webmaster [AT] securiteinfo.com>
+  D. Manzella              <manzella [AT] lucent.com>
 
 Alain Magloire <alainm[AT]rcsm.ece.mcgill.ca> was kind enough to give his
 permission to use his version of snprintf.c.