diff --git a/CHANGES b/CHANGES
index 065e1c605a..2873325ab4 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,7 @@
+ 204.   [cleanup]       On HP/UX, Pass +vnocompatwarnings to the linker
+                        to quiet the warnings that "The linked output may not
+                        run on a PA 1.x system."
+
  203.   [func]		notify and zone soa queries are now tsig signed when
 			appropriate.
 
@@ -39,7 +43,7 @@
 			Manual is no longer included in the ISC BIND9
 			distribution.
 
- 193.	[func]		changed dst_key_free() prototype
+ 193.	[func]		changed dst_key_free() prototype.
 
  192.	[bug]		Zone configuration validation is now done at end 
 			of config file parsing, and before loading
diff --git a/configure b/configure
index 16da39de0c..7bbe61b2a1 100755
--- a/configure
+++ b/configure
@@ -1,6 +1,6 @@
 #! /bin/sh
 
-# From configure.in Revision: 1.137 
+# From configure.in Revision: 1.139 
 
 
 
@@ -2336,7 +2336,7 @@ else
 			MKDEPCFLAGS="-xM"
 			;;
 		*-hp-hpux*)
-			CC="$CC -Ae -z +w1"
+			CC="$CC -Ae -z +w1 -Wl,+vnocompatwarnings"
 			MKDEPPROG='cc -Ae -E -Wp,-M >/dev/null 2>>$TMP'
 			;;
                 *-sgi-irix*)
@@ -4068,6 +4068,7 @@ trap 'rm -fr `echo "make/rules
 	bin/tests/dst/Makefile
 	bin/tests/mem/Makefile
 	bin/tests/sockaddr/Makefile
+	bin/tests/system/Makefile
 	bin/tests/headerdep_test.sh
 	bin/dnssec/Makefile
  config.h" | sed "s/:[^ ]*//g"` conftest*; exit 1' 1 2 15
@@ -4292,6 +4293,7 @@ CONFIG_FILES=\${CONFIG_FILES-"make/rules
 	bin/tests/dst/Makefile
 	bin/tests/mem/Makefile
 	bin/tests/sockaddr/Makefile
+	bin/tests/system/Makefile
 	bin/tests/headerdep_test.sh
 	bin/dnssec/Makefile
 "}
diff --git a/configure.in b/configure.in
index b89586f501..712ca21569 100644
--- a/configure.in
+++ b/configure.in
@@ -13,7 +13,7 @@ dnl PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS
 dnl ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
 dnl SOFTWARE.
 
-AC_REVISION($Revision: 1.138 $)
+AC_REVISION($Revision: 1.139 $)
 
 AC_PREREQ(2.13)
 
@@ -360,7 +360,7 @@ else
 			MKDEPCFLAGS="-xM"
 			;;
 		*-hp-hpux*)
-			CC="$CC -Ae -z +w1"
+			CC="$CC -Ae -z +w1 -Wl,+vnocompatwarnings"
 			MKDEPPROG='cc -Ae -E -Wp,-M >/dev/null 2>>$TMP'
 			;;
                 *-sgi-irix*)