diff --git a/CHANGES b/CHANGES
index a385defead3..26809d345d2 100644
--- a/CHANGES
+++ b/CHANGES
@@ -10,6 +10,11 @@ in the release notes and/or placed into UPDATING.
 
 All ports committers are allowed to commit to this file.
 
+20181110:
+AUTHOR: bapt@FreeBSD.org
+
+  texinfo files are now installed in ${PREFIX}/share/info
+
 20180630:
 AUTHOR: kde@FreeBSD.org
 
diff --git a/GIDs b/GIDs
index 27c400a40bc..796c0787213 100644
--- a/GIDs
+++ b/GIDs
@@ -442,7 +442,7 @@ alertmanager:*:479:
 # free: 499
 # free: 500
 # free: 501
-# free: 502
+birdvty:*:502:
 # free: 503
 # free: 504
 _bbstored:*:505:
diff --git a/MOVED b/MOVED
index 84cbf1025b8..9683c19a375 100644
--- a/MOVED
+++ b/MOVED
@@ -10624,3 +10624,5 @@ science/mei|science/code_saturne|2018-11-04|Code_Saturne merged bft, ecs, fvm, m
 x11-wm/cde|x11/cde|2018-11-03|Recategorise
 misc/rumprun||2018-11-06|Has expired: "fails with current compilers"
 security/ossec-hids-client|security/ossec-hids-agent|2018-10-29|Agent is the name used in documentation
+graphics/ImageMagick|graphics/ImageMagick6|2018-11-10|Port renamed
+lang/gcc6-devel|lang/gcc6|2018-11-11|The GCC 6 branch has been closed, use the final release instead (or a later major version)
diff --git a/Mk/Scripts/check-stagedir.sh b/Mk/Scripts/check-stagedir.sh
index 0b0f1377351..9037df598e6 100644
--- a/Mk/Scripts/check-stagedir.sh
+++ b/Mk/Scripts/check-stagedir.sh
@@ -154,7 +154,7 @@ check_orphans_from_plist() {
 		*/.svn/*|'@dir '*/.svn) ;;
 		*/.svnignore) ;;
 		*/CVS/*|'@dir '*/CVS) ;;
-		*/info/dir|info/dir|info/*/dir) ;;
+		*/info/dir|info/dir|info/*/dir|share/info/*/dir) ;;
 		share/fonts/*/fonts.dir) ;;
 		share/fonts/*/fonts.scale) ;;
 		share/applications/mimeinfo.cache) ;;
diff --git a/Mk/bsd.port.mk b/Mk/bsd.port.mk
index ebbeb2080e5..03b8e6f14c2 100644
--- a/Mk/bsd.port.mk
+++ b/Mk/bsd.port.mk
@@ -543,8 +543,6 @@ FreeBSD_MAINTAINER=	portmgr@FreeBSD.org
 #				  the path relative to ${INFO_PATH}.
 # INFO_PATH		- Path, where all .info files will be installed by your
 #				  port, relative to ${PREFIX}
-#				  Default: "share/info" if ${PREFIX} is equal to /usr
-#				  and "info" otherwise.
 #
 # Set the following to specify all documentation your port installs into
 # ${DOCSDIR}
@@ -2738,12 +2736,7 @@ MAN${sect}PREFIX?=	${MANPREFIX}
 .endfor
 MANLPREFIX?=	${MANPREFIX}
 MANNPREFIX?=	${MANPREFIX}
-
-.if ${PREFIX} == /usr
 INFO_PATH?=	share/info
-.else
-INFO_PATH?=	info
-.endif
 
 .if defined(INFO)
 RUN_DEPENDS+=	indexinfo:print/indexinfo
diff --git a/Templates/BSD.local.dist b/Templates/BSD.local.dist
index 8bbdee4285d..80ebde08867 100644
--- a/Templates/BSD.local.dist
+++ b/Templates/BSD.local.dist
@@ -27,8 +27,6 @@
         X11
         ..
     ..
-    info
-    ..
     lib
         debug
         ..
@@ -286,6 +284,8 @@
         ..
         examples
         ..
+        info
+        ..
         java
             classes
             ..