diff --git a/Keywords/javavm.ucl b/Keywords/javavm.ucl
new file mode 100644
index 00000000000..064fab9743c
--- /dev/null
+++ b/Keywords/javavm.ucl
@@ -0,0 +1,15 @@
+# $FreeBSD$
+#
+# The argument is not registered as a file because of how the various
+# jdk/jre are made: kind of autoplist which would make the bin/java registered
+# twice
+#
+# MAINAINER: java@FreeBSD.org
+
+actions: []
+post-install: <<EOD
+    registervm %@
+EOD
+pre-deinstall: <<EOD
+    unregistervm %@
+EOD
diff --git a/MOVED b/MOVED
index aa360f29045..e59533f47b2 100644
--- a/MOVED
+++ b/MOVED
@@ -8608,3 +8608,5 @@ devel/capstone|devel/capstone3|2016-07-10|Moved to a numbered port name to make
 net-mgmt/unifi3|net-mgmt/unifi4|2016-07-10|Has expired: Unifi 3.x is EoL. Please upgrade to net-mgmt/unifi4
 net/lam||2016-07-12|Has expired: Broken for more than 6 months
 java/wildfly82||2016-07-17|Has expired: Fully EOL when version 10.0 was released
+print/tex|print/texlive-base|2016-07-30|Superceeded by texlive
+net/tridiavnc|net/tigervnc|2016-08-01|No upstream 2005
diff --git a/Mk/bsd.linux-rpm.mk b/Mk/bsd.linux-rpm.mk
index 70fdd0841d5..2a9d996630a 100644
--- a/Mk/bsd.linux-rpm.mk
+++ b/Mk/bsd.linux-rpm.mk
@@ -156,7 +156,7 @@ EXTRACT_BEFORE_ARGS?=	<
 EXTRACT_AFTER_ARGS?=	| ${TAR} xf - --no-same-permissions --no-same-owner
 .endif
 
-DISTINFO_FILE?=				${MASTERDIR}/distinfo.${LINUX_RPM_ARCH}
+DISTINFO_FILE?=				${MASTERDIR}/distinfo.${LINUX_REPO_ARCH}
 
 BRANDELF_DIRS?=
 BRANDELF_FILES?=
@@ -176,7 +176,7 @@ linux-rpm-clean-portdocs:
 .  endif
 
 .  if ${USE_LINUX} != "f10"
-PLIST?=		${MASTERDIR}/pkg-plist.${LINUX_RPM_ARCH}
+PLIST?=		${MASTERDIR}/pkg-plist.${LINUX_REPO_ARCH}
 .  endif
 
 .  if defined(AUTOMATIC_PLIST)