Index: Mk/Uses/bdb.mk
===================================================================
--- Mk/Uses/bdb.mk
+++ Mk/Uses/bdb.mk
@@ -21,11 +21,6 @@
 #			  version.
 # WITH_BDB_HIGHEST
 #			- Use the highest installed version of Berkeley DB.
-# WITH_BDB6_PERMITTED
-# 			- If defined, BerkeleyDB 6 is added to the
-# 			  default version set, making it eligible even
-# 			  if not already installed. This is due to its
-# 			  stricter Affero GNU Public License.
 #
 # These variables will then be filled in by this .mk file:
 #
@@ -67,12 +62,8 @@
 
 _BDB_DEFAULT_save:=${BDB_DEFAULT}
 
-_DB_PORTS=		48 5 6
-_DB_DEFAULTS=	48 5	# does not include 6 due to different licensing
-#	but user can re-add it through WITH_BDB6_PERMITTED
-. if defined(WITH_BDB6_PERMITTED)
-_DB_DEFAULTS+=	6
-. endif
+_DB_PORTS=	48 5 6
+_DB_DEFAULTS=	48 5 6
 
 # Dependency lines for different db versions
 db48_DEPENDS=	libdb-4.8.so:databases/db48
Index: UPDATING
===================================================================
--- UPDATING
+++ UPDATING
@@ -5,6 +5,17 @@
 You should get into the habit of checking this file for changes each time
 you update your ports collection, before attempting any port upgrades.
 
+20170510:
+  AFFECTS: users of BerkeleyDB ports
+  AUTHOR: adamw@FreeBSD.org
+
+  The WITH_BDB6_PERMITTED variable has been removed, making bdb6 available
+  by default. If you need to forbid the AGPLv3 license, set
+
+    LICENSES_REJECTED+=	AGPLv3
+
+  in your make.conf.
+
 20170412:
   AFFECTS: users of sysutils/ansible
   AUTHOR: lifanov@FreeBSD.org