diff --git a/CHANGES b/CHANGES
index f393c97e48..f267507379 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,6 @@
+ 115.   [port]          Shut up the -Wmissing-declarations warning about
+                        <stdio.h>'s __sputaux on BSD/OS pre-4.1.
+
  114.   [cleanup]       <isc/sockaddr.h> does not need <isc/buffer.h> or
                         <isc/list.h>.
 
diff --git a/config.h.in b/config.h.in
index 1b26f7c49f..29af23d571 100644
--- a/config.h.in
+++ b/config.h.in
@@ -89,3 +89,11 @@
 
 /* Define if you have the socket library (-lsocket).  */
 #undef HAVE_LIBSOCKET
+
+/* Shut up warnings about sputaux in stdio.h on BSD/OS pre-4.1 */
+#undef SHUTUP_SPUTAUX
+#ifdef SHUTUP_SPUTAUX
+struct __sFILE;
+extern __inline int __sputaux(int _c, struct __sFILE *_p);
+#endif
+
diff --git a/configure b/configure
index 5a64396db6..e2846f88f2 100755
--- a/configure
+++ b/configure
@@ -1,6 +1,6 @@
 #! /bin/sh
 
-# From configure.in Revision: 1.120 
+# From configure.in Revision: 1.122 
 
 
 
@@ -3791,6 +3791,18 @@ fi
 done
 
 
+#
+# Random remaining OS-specific issues.
+#
+case "$host" in
+	*-bsdi3.1*|*-bsdi4.0*)
+		cat >> confdefs.h <<\EOF
+#define SHUTUP_SPUTAUX 1
+EOF
+
+		;;
+esac
+
 #
 # Substitutions
 #
@@ -3820,7 +3832,6 @@ BIND9_INCLUDES=$BIND9_TOP_BUILDDIR/make/includes
 BIND9_MAKE_RULES=$BIND9_TOP_BUILDDIR/make/rules
 
 . $srcdir/version
-
 BIND9_VERSION="VERSION=${MAJORVER}.${MINORVER}.${PATCHVER}${RELEASETYPE}${RELEASEVER}"
 
 
diff --git a/configure.in b/configure.in
index 2658e85459..9891a17427 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.121 $)
+AC_REVISION($Revision: 1.122 $)
 
 AC_PREREQ(2.13)
 
@@ -772,6 +772,15 @@ AC_CHECK_FUNC(chroot, AC_DEFINE(HAVE_CHROOT))
 AC_CHECK_HEADERS(linux/capability.h)
 AC_CHECK_HEADERS(linux/prctl.h)
 
+#
+# Random remaining OS-specific issues.
+#
+case "$host" in
+	*-bsdi3.1*|*-bsdi4.0*)
+		AC_DEFINE(SHUTUP_SPUTAUX)
+		;;
+esac
+
 #
 # Substitutions
 #