diff --git a/MOVED b/MOVED
index 22c08582c13e..841285d4863b 100644
--- a/MOVED
+++ b/MOVED
@@ -10919,3 +10919,15 @@ multimedia/xmms||2018-12-21|Has expired: Uses obsolete glib12
 devel/glib12||2018-12-21|Has expired: Obsolete
 graphics/gdk-pixbuf||2018-12-21|Has expired: Uses obsolete glib12
 x11-toolkits/gtk12||2018-12-21|Has expired: Uses obsolete glib12
+databases/rubygem-peek-mysql2|databases/rubygem-peek-mysql2-rails50|2018-12-23|Dep change for gitlab-ce, please use databases/rubygem-peek-mysql2-rails50 instead
+databases/rubygem-peek-pg|databases/rubygem-peek-pg-rails50|2018-12-23|Dep change for gitlab-ce, please use databases/rubygem-peek-pg-rails50 instead
+devel/rubygem-font-awesome-rails-rails4|devel/rubygem-font-awesome-rails-rails50|2018-12-23|Dep change for gitlab-ce, please use databases/rubygem-peek-pg-rails50 instead
+www/rubygem-webpack-rails|www/rubygem-webpack-rails-rails50|2018-12-23|Dep change for gitlab-ce, please use www/rubygem-webpack-rails-rails50 instead
+www/rubygem-gon|www/rubygem-gon-rails50|2018-12-23|Dep change for gitlab-ce, please use www/rubygem-gon-rails50 instead
+mail/rubygem-premailer-rails19|mail/rubygem-premailer-rails19-rails50|2018-12-23|Dep change for gitlab-ce, please use www/rubygem-premailer-rails19-rails50 instead
+devel/rubygem-peek-redis|devel/rubygem-peek-redis-rails50|2018-12-23|Dep change for gitlab-ce, please use devel/rubygem-peek-redis-rails50 instead
+devel/rubygem-peek-gc|devel/rubygem-peek-gc-rails50|2018-12-23|Dep change for gitlab-ce, please use devel/rubygem-peek-gc-rails50 instead
+devel/rubygem-peek-rblineprof|devel/rubygem-peek-rblineprof-rails50|2018-12-23|Dep change for gitlab-ce, please use devel/rubygem-peek-rblineprof-rails50 instead
+devel/rubygem-health_check26|devel/rubygem-health_check26-rails50|2018-12-23|Dep change for gitlab-ce, please use devel/rubygem-health_check26-rails50 instead
+devel/rubygem-default_value_for30|devel/rubygem-gitlab-default_value_for|2018-12-23|Dep change for gitlab-ce, please use devel/rubygem-gitlab-default_value_for instead
+devel/rubygem-gettext_i18n_rails_js|devel/rubygem-gettext_i18n_rails_js-rails50|2018-12-23|Dep change for gitlab-ce, please use devel/rubygem-gettext_i18n_rails_js-rails50 instead
diff --git a/Mk/Uses/compiler.mk b/Mk/Uses/compiler.mk
index 81dac4d50c15..cbc2d4699daf 100644
--- a/Mk/Uses/compiler.mk
+++ b/Mk/Uses/compiler.mk
@@ -176,8 +176,8 @@ CHOSEN_COMPILER_TYPE=	gcc
 .if (defined(FAVORITE_COMPILER) && ${FAVORITE_COMPILER} == gcc) || (${ARCH} != amd64 && ${ARCH} != i386) # clang not always supported on Tier-2
 USE_GCC=	yes
 CHOSEN_COMPILER_TYPE=	gcc
-.elif (${COMPILER_TYPE} == clang && ${COMPILER_VERSION} < 50) || ${COMPILER_TYPE} == gcc
-.if ${ALT_COMPILER_TYPE} == clang && ${ALT_COMPILER_VERSION} >= 50
+.elif ${COMPILER_TYPE} == gcc
+.if ${ALT_COMPILER_TYPE} == clang
 CPP=	clang-cpp
 CC=	clang
 CXX=	clang++
@@ -198,8 +198,8 @@ CHOSEN_COMPILER_TYPE=	clang
 .if (defined(FAVORITE_COMPILER) && ${FAVORITE_COMPILER} == gcc) || (${ARCH} != amd64 && ${ARCH} != i386) # clang not always supported on Tier-2
 USE_GCC=	yes
 CHOSEN_COMPILER_TYPE=	gcc
-.elif (${COMPILER_TYPE} == clang && ${COMPILER_VERSION} < 35) || ${COMPILER_TYPE} == gcc
-.if ${ALT_COMPILER_TYPE} == clang && ${ALT_COMPILER_VERSION} >= 35
+.elif ${COMPILER_TYPE} == gcc
+.if ${ALT_COMPILER_TYPE} == clang
 CPP=	clang-cpp
 CC=	clang
 CXX=	clang++
diff --git a/Mk/bsd.gecko.mk b/Mk/bsd.gecko.mk
index 4beb1c2808b0..5eeaafd6843a 100644
--- a/Mk/bsd.gecko.mk
+++ b/Mk/bsd.gecko.mk
@@ -339,7 +339,7 @@ post-patch-SNDIO-on:
 .endif
 
 .if ${PORT_OPTIONS:MRUST} || ${MOZILLA_VER:R:R} >= 54
-BUILD_DEPENDS+=	${RUST_PORT:T}>=1.28:${RUST_PORT}
+BUILD_DEPENDS+=	${RUST_PORT:T}>=1.29:${RUST_PORT}
 RUST_PORT?=		lang/rust
 . if ${MOZILLA_VER:R:R} < 54
 MOZ_OPTIONS+=	--enable-rust
diff --git a/UPDATING b/UPDATING
index 443af3b759de..3338edfb4794 100644
--- a/UPDATING
+++ b/UPDATING
@@ -5,6 +5,29 @@ 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.
 
+20181222:
+  AFFECTS: users of net/ntopng
+  AUTHOR: madpilot@FreeBSD.org
+
+  Since ntopng 3.7, for security reasons, the default setting for
+  the data directory has been changed to "/var/db/ntopng", and the
+  default user has been changed to "ntopng". This new directory is
+  created automatically by the port/package with correct permissions.
+
+  In order to maintain backward compatibility, if you are already
+  using "/var/tmp/ntopng" as data directory, ntopng keeps using that
+  folder, owned by "nobody". This said, using the old defaults is not
+  recommended and a manual action is required in order to migrate to
+  the new settings, unless you are already using a custom directory:
+
+  # service ntopng stop
+  # mv /var/tmp/ntopng/* /var/db/ntopng/
+  # chown -R ntopng:ntopng /var/db/ntopng
+  # service ntopng start
+
+  Please check hte upstream FAQ for reference:
+	https://www.ntop.org/support/faq/migrate-the-data-directory-in-ntopng/
+
 20181218:
   AFFECTS: users of misc/openhab2
   AUTHOR: netchild@FreeBSD.org