diff --git a/ObsoleteFiles.inc b/ObsoleteFiles.inc
index 3629bb843543..5ac579f984a3 100644
--- a/ObsoleteFiles.inc
+++ b/ObsoleteFiles.inc
@@ -38,6 +38,11 @@
 #   xargs -n1 | sort | uniq -d;
 # done
 
+# 20141028: debug files accidentally installed as directory name
+OLD_FILES+=usr/lib/debug/usr/lib/i18n
+OLD_FILES+=usr/lib/debug/usr/lib/private
+OLD_FILES+=usr/lib/debug/usr/lib32/i18n
+OLD_FILES+=usr/lib/debug/usr/lib32/private
 # 20141015: OpenSSL 1.0.1j import
 OLD_FILES+=usr/share/openssl/man/man3/CMS_sign_add1_signer.3.gz
 # 20140922: sleepq_calc_signal_retval.9 and sleepq_catch_signals.9 removed
diff --git a/etc/mtree/BSD.debug.dist b/etc/mtree/BSD.debug.dist
index ab75d0fbb781..7797a4c4173d 100644
--- a/etc/mtree/BSD.debug.dist
+++ b/etc/mtree/BSD.debug.dist
@@ -26,8 +26,16 @@
             lib
                 engines
                 ..
+                i18n
+                ..
+                private
+                ..
             ..
             lib32
+                i18n
+                ..
+                private
+                ..
             ..
             libexec
                 bsdinstall