diff -urNh ../autoconf-2.53/config/config.guess ./config/config.guess
--- ../autoconf-2.53/config/config.guess	Tue Mar  5 08:36:00 2002
+++ ./config/config.guess	Wed May 29 20:56:07 2002
@@ -127,6 +127,22 @@
 # Note: order is significant - the case branches are not exclusive.
 
 case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
+    *:NetBSD:*:Debian*)
+	# Debian GNU/NetBSD system. These have a different userland to
+	# standard NetBSD systems and so require a different target.
+        sysctl="sysctl -n hw.machine_arch"
+        UNAME_MACHINE_ARCH=`(/sbin/$sysctl 2>/dev/null || \
+            /usr/sbin/$sysctl 2>/dev/null || echo unknown)`
+        case "${UNAME_MACHINE_ARCH}" in
+            arm*) machine=arm-unknown ;;
+            sh3el) machine=shl-unknown ;;
+            sh3eb) machine=sh-unknown ;;
+            *) machine=${UNAME_MACHINE_ARCH}-unknown ;;
+        esac
+        os=netbsd
+        # CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM is used.
+        echo "${machine}-${os}-debian"
+        exit 0 ;;
     *:NetBSD:*:*)
 	# NetBSD (nbsd) targets should (where applicable) match one or
 	# more of the tupples: *-*-netbsdelf*, *-*-netbsdaout*,
diff -urNh ../autoconf-2.53/config/config.sub ./config/config.sub
--- ../autoconf-2.53/config/config.sub	Fri Mar  8 12:45:45 2002
+++ ./config/config.sub	Wed May 29 21:00:04 2002
@@ -118,7 +118,7 @@
 # Here we must recognize all the valid KERNEL-OS combinations.
 maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'`
 case $maybe_os in
-  nto-qnx* | linux-gnu* | storm-chaos* | os2-emx* | windows32-* | rtmk-nova*)
+  nto-qnx* | linux-gnu* | storm-chaos* | os2-emx* | windows32-* | rtmk-nova* | netbsd-debian*)
     os=-$maybe_os
     basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`
     ;;
diff -urNh ../autoconf-2.53/debian/rules ./debian/rules
--- ../autoconf-2.53/debian/rules	Wed May 29 21:08:46 2002
+++ ./debian/rules	Wed May 29 21:03:40 2002
@@ -11,7 +11,7 @@
 	dh_testdir
 	AWK=awk ./configure --prefix=/usr
 	$(MAKE) CFLAGS=-O2 LDFLAGS=-s
-	texi2html -monolithic -out_file autoconf.html doc/autoconf.texi
+	texi2html -monolithic doc/autoconf.texi
 	chmod a+x debian/fixlinks
 	./debian/fixlinks autoconf.html
 	touch build-stamp