diff --git a/GIDs b/GIDs
index 32db5cc3211..73fc2ec76b8 100644
--- a/GIDs
+++ b/GIDs
@@ -137,7 +137,7 @@ moinmoin:*:192:
 cups:*:193:
 saned:*:194:
 radns:*:195:
-# free: 196
+nova:*:196:
 # free: 197
 # free: 198
 mcserver:*:199:
diff --git a/MOVED b/MOVED
index b1618a77d9a..c9e671be361 100644
--- a/MOVED
+++ b/MOVED
@@ -8832,3 +8832,13 @@ databases/py35-psycopg2|databases/py3-psycopg2|2016-12-10|Moved to match existin
 www/linux-f10-flashplugin11||2016-12-13|Deprecated
 www/linux-c6-flashplugin11|www/linux-c6-flashplugin24|2016-12-13|Deprecated
 www/linux-c7-flashplugin11|www/linux-c7-flashplugin24|2016-12-13|Deprecated
+net/py-ceilometerclient|net/py-python-ceilometerclient|2016-12-17|Rename to match pypi name
+net/py-cinderclient|net/py-python-cinderclient|2016-12-17|Rename to match pypi name
+net/py-designateclient|net/py-python-designateclient|2016-12-17|Rename to match pypi name
+net/py-glanceclient|net/py-python-glanceclient|2016-12-17|Rename to match pypi name
+net/py-heatclient|net/py-python-heatclient|2016-12-17|Rename to match pypi name
+net/py-keystoneclient|net/py-python-keystoneclient|2016-12-17|Rename to match pypi name
+net/py-neutronclient|net/py-python-neutronclient|2016-12-17|Rename to match pypi name
+net/py-novaclient|net/py-python-novaclient|2016-12-17|Rename to match pypi name
+net/py-openstackclient|net/py-python-openstackclient|2016-12-17|Rename to match pypi name
+www/py-django-openstack-auth|www/py-django_openstack_auth|2016-12-18|Rename to match pypi name
diff --git a/Mk/Uses/gecko.mk b/Mk/Uses/gecko.mk
index d7c236b90e5..a5f99b1c3e0 100644
--- a/Mk/Uses/gecko.mk
+++ b/Mk/Uses/gecko.mk
@@ -51,8 +51,8 @@ _GECKO_INSTALLED_VER:=	${_GECKO_INSTALLED_VER:M[0-9][0-9]*:C/([0-9][0-9]).*/\1/g
 
 .elif ${gecko_ARGS:Mseamonkey}
 
-_GECKO_DEFAULT_VERSION=	40
-_GECKO_VERSIONS=		40
+_GECKO_DEFAULT_VERSION=	46
+_GECKO_VERSIONS=		46
 _GECKO_TYPE=	seamonkey
 
 .if exists(${LOCALBASE}/bin/seamonkey)
@@ -61,7 +61,7 @@ _GECKO_INSTALLED_VER:=	${_GECKO_INSTALLED_VER:M[0-9]*:C/[0-9].([0-9][0-9]).*/\1/
 .endif
 
 # Dependence lines for different Seamonkey versions
-40_DEPENDS=		${LOCALBASE}/lib/seamonkey/seamonkey:www/seamonkey
+46_DEPENDS=		${LOCALBASE}/lib/seamonkey/seamonkey:www/seamonkey
 
 .elif ${gecko_ARGS:Mthunderbird}
 
diff --git a/UIDs b/UIDs
index ef16c584834..f9ffadbe734 100644
--- a/UIDs
+++ b/UIDs
@@ -142,7 +142,7 @@ moinmoin:*:192:192::0:0:MoinMoin User:/nonexistent:/usr/sbin/nologin
 cups:*:193:193::0:0:Cups Owner:/nonexistent:/usr/sbin/nologin
 saned:*:194:194::0:0:SANE Scanner Daemon:/nonexistent:/bin/sh
 radns:*:195:195::0:0:radns user:/nonexistent:/usr/sbin/nologin
-# free: 196
+nova:*:196:196::0:0:Nova daemon pseudo-user:/var/lib/nova:/usr/sbin/nologin
 # free: 197
 # free: 198
 mcserver:*:199:199::0:0:Minecraft Server:/nonexistent:/bin/sh
diff --git a/UPDATING b/UPDATING
index fc0d2e412a6..d23a9bf7fa5 100644
--- a/UPDATING
+++ b/UPDATING
@@ -5,6 +5,14 @@ they are unavoidable.
 You should get into the habit of checking this file for changes each time
 you update your ports collection, before attempting any port upgrades.
 
+20161216:
+  AFFECTS: mail/thunderbird, www/seamonkey
+  AUTHOR: gecko@FreeBSD.org
+
+  ENIGMAIL is no longer provided as part of the ports after upstream
+  dropped binary components in 1.9. Go to Tools -> Add-ons Manager
+  then type "enigmail" in the search box to install.
+
 20161213:
   AFFECTS: users of devel/skalibs, lang/execline, sysutils/s6
   AUTHOR: Colin Booth <colin-ports@heliocat.net>