diff --git a/tools/add-optional-obsolete-files-entries.sh b/tools/add-optional-obsolete-files-entries.sh
index 7776780a4d4..f4c5ed69b8f 100755
--- a/tools/add-optional-obsolete-files-entries.sh
+++ b/tools/add-optional-obsolete-files-entries.sh
@@ -42,8 +42,10 @@ done
 
 # Enumerate all of the installed files/directories
 (cd $DESTDIR;
- find -s . -type f -mindepth 1 | sed -e 's,^,OLD_FILES+=,';
+ find -s . -type f -mindepth 1 | \
+    sed -e 's,^,OLD_FILES+=,' \
+        -e '/lib\/.*\.so\.[0-9]\.*/s/OLD_FILES+=/OLD_LIBS+=/g';
  find -s . -type d -mindepth 1 -and \! -empty | \
-    egrep -v '^\./(s*bin|libexec|usr|usr/include|usr/lib|usr/lib/private|usr/libexec|usr/s*bin|usr/share|usr/share/man|usr/share/man/man[0-9])$' | \
+    grep -v '^\./(s*bin|libexec|usr|usr/include|usr/lib(data)?|usr/libdata/pkgconfig|usr/lib/private|usr/libexec|usr/s*bin|usr/share(/(examples|man))?|usr/share/man/man[0-9])$' | \
     sed -e 's,^,OLD_DIRS+=,'
 ) | sed -e 's,+=\./,+=,'