diff --git a/CHANGES b/CHANGES
index 2f42689d51..0dbbab96fa 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,6 +1,10 @@
 
 	--- 9.2.0b1 released ---
 
+ 939.	[port]		Add the --disable-linux-caps option to configure for
+ 			systems that manage capabilities outside of named.
+			[RT #1503]
+
  938.	[placeholder]
 
  937.	[bug]		A race when shutting down a zone could trigger a
diff --git a/configure.in b/configure.in
index 4c85b351d3..efe56447e5 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.280 $)
+AC_REVISION($Revision: 1.281 $)
 
 AC_INIT(lib/dns/name.c)
 AC_PREREQ(2.13)
@@ -1347,7 +1347,15 @@ AC_SUBST(ISC_PLATFORM_QUADFORMAT)
 # Security Stuff
 #
 AC_CHECK_FUNC(chroot, AC_DEFINE(HAVE_CHROOT))
-AC_CHECK_HEADERS(linux/capability.h)
+AC_ARG_ENABLE(linux-caps,
+	[  --disable-linux-caps	disable linux capabilities])
+case "$enable_linux_caps" in
+	yes|'')
+		AC_CHECK_HEADERS(linux/capability.h)
+		;;
+	no)
+		;;
+esac
 AC_CHECK_HEADERS(sys/prctl.h)
 
 #