diff --git a/ChangeLog b/ChangeLog
index 3c87cb229..9ab15b58c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+20030908
+ - (tim) [configure.ac openbsd-compat/getrrsetbyname.c] wrap _getshort and
+   _getlong in #ifndef
+
 20030907
  - (dtucker) [agent-ptrace.sh dynamic-forward.sh (all regress/)]
    Put "which" inside quotes.
@@ -1037,4 +1041,4 @@
  - Fix sshd BindAddress and -b options for systems using fake-getaddrinfo.
    Report from murple@murple.net, diagnosis from dtucker@zip.com.au
 
-$Id: ChangeLog,v 1.2969 2003/09/07 02:34:54 dtucker Exp $
+$Id: ChangeLog,v 1.2970 2003/09/08 13:33:33 tim Exp $
diff --git a/configure.ac b/configure.ac
index 9559bcb7e..58777a4ec 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,4 +1,4 @@
-# $Id: configure.ac,v 1.145 2003/09/07 02:34:54 dtucker Exp $
+# $Id: configure.ac,v 1.146 2003/09/08 13:33:33 tim Exp $
 
 AC_INIT
 AC_CONFIG_SRCDIR([ssh.c])
@@ -1912,6 +1912,7 @@ AC_ARG_WITH(dns,
 					# Needed by our getrrsetbyname()
 					AC_SEARCH_LIBS(res_query, resolv)
 					AC_SEARCH_LIBS(dn_expand, resolv)
+					AC_CHECK_FUNCS(_getshort _getlong)
 				])
 		fi
 	]
diff --git a/openbsd-compat/getrrsetbyname.c b/openbsd-compat/getrrsetbyname.c
index 3ba54e0da..3f75590e2 100644
--- a/openbsd-compat/getrrsetbyname.c
+++ b/openbsd-compat/getrrsetbyname.c
@@ -130,6 +130,7 @@ static int count_dns_rr(struct dns_rr *, u_int16_t, u_int16_t);
  * Routines to insert/extract short/long's.
  */
 
+#ifndef HAVE__GETSHORT
 static u_int16_t
 _getshort(msgp)
 	register const u_char *msgp;
@@ -139,7 +140,9 @@ _getshort(msgp)
 	GETSHORT(u, msgp);
 	return (u);
 }
+#endif
 
+#ifndef HAVE__GETLONG
 static u_int32_t
 _getlong(msgp)
 	register const u_char *msgp;
@@ -149,6 +152,7 @@ _getlong(msgp)
 	GETLONG(u, msgp);
 	return (u);
 }
+#endif
 
 int
 getrrsetbyname(const char *hostname, unsigned int rdclass,