diff --git a/GIDs b/GIDs
index 57e20cd3dcf..f7754e6901c 100644
--- a/GIDs
+++ b/GIDs
@@ -193,6 +193,7 @@ slurm:*:468:
 consul:*:469:
 serf:*:470:
 vault:*:471:
+nomad:*:472:
 _bbstored:*:505:
 radmind:*:506:
 skkserv:*:507:
diff --git a/Keywords/sample.ucl b/Keywords/sample.ucl
index 548cc20018e..9d3fc498f0d 100644
--- a/Keywords/sample.ucl
+++ b/Keywords/sample.ucl
@@ -35,8 +35,7 @@ post-install: <<EOD
   *) target_file="%D/${target_file}" ;;
   esac
   if ! [ -f "${target_file}" ]; then
-    /bin/cp -p "${sample_file}" "${target_file}" && \
-      /bin/chmod u+w "${target_file}"
+    /bin/cp -p "${sample_file}" "${target_file}"
   fi
 EOD
 pre-deinstall: <<EOD
diff --git a/MOVED b/MOVED
index 440cdefb303..0b7b3e4cde9 100644
--- a/MOVED
+++ b/MOVED
@@ -8370,3 +8370,4 @@ x11-toolkits/gtk-sharp10||2016-06-20|Not depend on anymore superceeded by gtk-sh
 devel/p5-ReadLine-Perl|devel/p5-Term-ReadLine-Perl|2016-06-21|Duplicates
 devel/p5-ReadLine-Gnu|devel/p5-Term-ReadLine-Gnu|2016-06-21|Rename to match upstream
 devel/p5-ReadLine-TTYtter|devel/p5-Term-ReadLine-TTYtter|2016-06-21|Rename to match upstream
+graphics/linux-c6-dri-compat|graphics/linux-c6-dri|2016-06-22|Obsolete
diff --git a/Mk/Uses/pgsql.mk b/Mk/Uses/pgsql.mk
index 8d38229568d..6c37d8be01f 100644
--- a/Mk/Uses/pgsql.mk
+++ b/Mk/Uses/pgsql.mk
@@ -130,7 +130,7 @@ IGNORE?=		cannot install: does not work with postgresql${PGSQL_VER_NODOT}-client
 .	endfor
 .    endif # IGNORE_WITH_PGSQL
 
-.if !defined(WANT_PGSQL) || ${WANT_PGSQL} == lib
+.if !defined(WANT_PGSQL) || ${WANT_PGSQL:Mlib}
 LIB_DEPENDS+=	libpq.so.${PGSQL${PGSQL_VER_NODOT}_LIBVER}:databases/postgresql${PGSQL_VER_NODOT}-client
 .endif
 
diff --git a/Mk/bsd.kde4.mk b/Mk/bsd.kde4.mk
index b894399cb17..0c013255238 100644
--- a/Mk/bsd.kde4.mk
+++ b/Mk/bsd.kde4.mk
@@ -74,8 +74,9 @@ Kde_Pre_Include=	bsd.kde4.mk
 #
 
 KDE4_VERSION?=		4.14.3
+KDE4_KDELIBS_VERSION=	4.14.10
 KDE4_ACTIVITES_VERSION=	4.13.3
-KDE4_WORKSPACE_VERSION=	4.11.14
+KDE4_WORKSPACE_VERSION=	4.11.21
 KDE4_APPLICATIONS_VERSION?=	15.04.3
 KDE4_APPLICATIONS_BRANCH?=	Attic
 KDE4_BRANCH?=		stable
@@ -94,8 +95,11 @@ CMAKE_ARGS+=	-DCMAKE_PREFIX_PATH="${LOCALBASE};${KDE4_PREFIX}" \
 
 PLIST_SUB+=	KDE4_PREFIX="${KDE4_PREFIX}" \
 		KDE4_VERSION="${KDE4_VERSION}" \
-		KDE4_GENERIC_LIB_VERSION=${KDE4_VERSION} \
-		KDE4_NON_GENERIC_LIB_VERSION=${KDE4_VERSION:S,^4,5,}
+		KDE4_GENERIC_LIB_VERSION=${KDE4_KDELIBS_VERSION} \
+		KDE4_NON_GENERIC_LIB_VERSION=${KDE4_KDELIBS_VERSION:S,^4,5,} \
+		KDE4_KDELIBS_VERSION=${KDE4_KDELIBS_VERSION} \
+		KDE4_NG_KDELIBS_VERSION=${KDE4_KDELIBS_VERSION:S,^4,5,}
+
 
 # Keep in sync with cmake/modules/PythonMacros.cmake
 _PYTHON_SHORT_VER=	${PYTHON_VERSION:S/^python//:S/.//}
diff --git a/UIDs b/UIDs
index c7e2c07b7a0..f84a527d989 100644
--- a/UIDs
+++ b/UIDs
@@ -200,6 +200,7 @@ slurm:*:468:468::0:0:SLURM Daemon:/home/slurm:/usr/sbin/nologin
 consul:*:469:469::0:0:Consul Daemon:/var/tmp/consul:/usr/sbin/nologin
 serf:*:470:470::0:0:Serf Daemon:/nonexistent:/usr/sbin/nologin
 vault:*:471:471::0:0:Vault Daemon:/nonexistent:/usr/sbin/nologin
+nomad:*:472:472::0:0:Nomad Daemon:/var/tmp/nomad:/usr/sbin/nologin
 _bbstored:*:505:505::0:0:Box Backup Store Daemon:/nonexistent:/usr/sbin/nologin
 radmind:*:506:506::0:0:radmind User:/var/radmind:/usr/sbin/nologin
 skkserv:*:507:507::0:0:skkserv User:/nonexistent:/usr/sbin/nologin