diff --git a/ObsoleteFiles.inc b/ObsoleteFiles.inc
index b4556b476b94..b2e561691fb7 100644
--- a/ObsoleteFiles.inc
+++ b/ObsoleteFiles.inc
@@ -2045,6 +2045,7 @@ OLD_FILES+=usr/share/man/man1/makeinfo.1.gz
 OLD_FILES+=usr/share/man/man1/texindex.1.gz
 OLD_FILES+=usr/share/man/man5/info.5.gz
 OLD_FILES+=usr/share/man/man5/texinfo.5.gz
+OLD_DIRS+=usr/share/info
 # 20141231: new clang import which bumps version from 3.4.1 to 3.5.0.
 OLD_FILES+=usr/include/clang/3.4.1/__wmmintrin_aes.h
 OLD_FILES+=usr/include/clang/3.4.1/__wmmintrin_pclmul.h
diff --git a/etc/mtree/BSD.usr.dist b/etc/mtree/BSD.usr.dist
index 2f1ad77e4c5f..c1c224375951 100644
--- a/etc/mtree/BSD.usr.dist
+++ b/etc/mtree/BSD.usr.dist
@@ -504,8 +504,6 @@
                 ..
             ..
         ..
-        info
-        ..
         keys
             pkg
                 revoked