diff --git a/filesystem.spec b/filesystem.spec
index d726eb6..133354e 100644
--- a/filesystem.spec
+++ b/filesystem.spec
@@ -1,7 +1,7 @@
 Summary: The basic directory layout for a Linux system
 Name: filesystem
 Version: 3.2
-Release: 32%{?dist}
+Release: 33%{?dist}
 License: Public Domain
 URL: https://fedorahosted.org/filesystem
 Group: System Environment/Base
@@ -124,6 +124,10 @@ posix.mkdir("/usr/sbin")
 posix.mkdir("/usr/lib")
 posix.mkdir("/usr/lib/debug")
 posix.mkdir("/usr/lib/debug/usr/")
+posix.mkdir("/usr/lib/debug/usr/bin")
+posix.mkdir("/usr/lib/debug/usr/sbin")
+posix.mkdir("/usr/lib/debug/usr/lib")
+posix.mkdir("/usr/lib/debug/usr/%{_lib}")
 posix.mkdir("/usr/%{_lib}")
 posix.symlink("usr/bin", "/bin")
 posix.symlink("usr/sbin", "/sbin")
@@ -197,6 +201,10 @@ restorecon /media 2>/dev/null >/dev/null || :
 %ghost /usr/lib/debug/lib
 %ghost /usr/lib/debug/%{_lib}
 %ghost /usr/lib/debug/usr
+%ghost /usr/lib/debug/usr/bin
+%ghost /usr/lib/debug/usr/sbin
+%ghost /usr/lib/debug/usr/lib
+%ghost /usr/lib/debug/usr/%{_lib}
 %ghost /usr/lib/debug/usr/.dwz
 %ghost /usr/lib/debug/sbin
 %attr(555,root,root) /usr/lib/games
@@ -264,6 +272,9 @@ restorecon /media 2>/dev/null >/dev/null || :
 /var/yp
 
 %changelog
+* Mon May 25 2015 Ondrej Vasik <ovasik@redhat.com> - 3.2-33
+- prevent potentially broken symlinks in debuginfo dirs (#1195641)
+
 * Sat Aug 16 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 3.2-32
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild