diff --git a/CHANGES b/CHANGES
index 3491d7709e..c4b6d5c9fa 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,7 @@
+
+ 761.	[bug]		_REENTRANT was still defined when building with
+			--disable-threads.
+
  760.	[contrib]	Significant enhancements to the pgsql sdb driver.
 
  759.	[bug]		The resolver didn't turn off "avoid fetches" mode
diff --git a/configure.in b/configure.in
index 8b15991b56..dec8bb7879 100644
--- a/configure.in
+++ b/configure.in
@@ -18,7 +18,7 @@ AC_DIVERT_PUSH(AC_DIVERSION_NOTICE)dnl
 esyscmd([sed "s/^/# /" COPYRIGHT])dnl
 AC_DIVERT_POP()dnl
 
-AC_REVISION($Revision: 1.234 $)
+AC_REVISION($Revision: 1.235 $)
 
 AC_INIT(lib/dns/name.c)
 AC_PREREQ(2.13)
@@ -551,13 +551,16 @@ then
 			;;
 		esac
 	fi
+	ALWAYS_DEFINES="-D_REENTRANT"
 	ISC_PLATFORM_USETHREADS="#define ISC_PLATFORM_USETHREADS 1"
 	thread_dir=pthreads
 else
 	ISC_PLATFORM_USETHREADS="#undef ISC_PLATFORM_USETHREADS"
 	thread_dir=nothreads
+	ALWAYS_DEFINES=""
 fi
 
+AC_SUBST(ALWAYS_DEFINES)
 AC_SUBST(ISC_PLATFORM_USETHREADS)
 
 ISC_THREAD_DIR=$thread_dir
diff --git a/make/rules.in b/make/rules.in
index cb50135732..c71838a9ff 100644
--- a/make/rules.in
+++ b/make/rules.in
@@ -13,7 +13,7 @@
 # NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION
 # WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 
-# $Id: rules.in,v 1.28 2001/02/01 23:19:05 sjacob Exp $
+# $Id: rules.in,v 1.29 2001/03/02 17:36:27 halley Exp $
 
 ###
 ### Common Makefile rules for BIND 9.
@@ -101,7 +101,7 @@ STD_CWARNINGS =	@STD_CWARNINGS@
 .SUFFIXES: .c .@O@
 
 ALWAYS_INCLUDES = -I${top_builddir}
-ALWAYS_DEFINES = -D_REENTRANT
+ALWAYS_DEFINES = @ALWAYS_DEFINES@
 ALWAYS_WARNINGS =
 
 ALL_CPPFLAGS = \