diff --git a/libreoffice-share-linker.changes b/libreoffice-share-linker.changes
index b67c206..dfd7592 100644
--- a/libreoffice-share-linker.changes
+++ b/libreoffice-share-linker.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Tue May 16 14:03:27 UTC 2017 - tchvatal@suse.com
+
+- Fix bsc#953511 by removing leftover dirs
+
 -------------------------------------------------------------------
 Fri Apr 21 11:19:42 UTC 2017 - tchvatal@suse.com
 
diff --git a/link-to-ooo-home b/link-to-ooo-home
index f31f0f4..9c27a69 100644
--- a/link-to-ooo-home
+++ b/link-to-ooo-home
@@ -53,6 +53,17 @@ change_linking() {
                 fi
             fi
         done
+	leftover_dirs="
+		/usr/share/libreoffice/help
+		/usr/share/libreoffice/program
+		/usr/share/libreoffice/share
+		/usr/share/libreoffice
+	"
+	for i in ${leftover_dirs}; do
+		if [[ -d ${i} && ! "$(ls -A ${i})" ]]; then
+			rmdir "${i}" || exit 1
+		fi
+	done
     fi
 }