diff --git a/ghc-pkg-wrapper b/ghc-pkg-wrapper
index 716cccf..0b2a417 100755
--- a/ghc-pkg-wrapper
+++ b/ghc-pkg-wrapper
@@ -22,7 +22,7 @@ if [ -x "$INPLACE_GHCPKG" ]; then
             ;;
         # 7.8 and 7.10
         *)
-            GHC_PKG="$PKGBASEDIR/bin/ghc-pkg --global-package-db=$PKGCONFDIR"
+            GHC_PKG="env LD_LIBRARY_PATH=$(dirname $PKGBASEDIR) $PKGBASEDIR/bin/ghc-pkg --global-package-db=$PKGCONFDIR"
             ;;
     esac
 else
diff --git a/ghc-rpm-macros.spec b/ghc-rpm-macros.spec
index 9e5a9c9..7fb43f9 100644
--- a/ghc-rpm-macros.spec
+++ b/ghc-rpm-macros.spec
@@ -164,7 +164,7 @@ EOF
 %changelog
 * Mon Jan 22 2018 Jens Petersen <petersen@redhat.com> - 1.8.0-1
 - add _ghcdynlibdir for Cabal --dynlibdir
-- dynlibs in _libdir except ghc's libs
+- dynlibs in _libdir
 - drop ghc_without_shared
 - ghc_fix_rpath removes RPATHs for 8.2+
 
diff --git a/macros.ghc b/macros.ghc
index 986cba6..e00139a 100644
--- a/macros.ghc
+++ b/macros.ghc
@@ -91,15 +91,8 @@ rm -f %{basepkg}.files %{basepkg}-devel.files\
 touch %{basepkg}.files %{basepkg}-devel.files\
 echo ${pkgconf} >> %{basepkg}-devel.files\
 if [ -d "%{buildroot}${pkgdir}" ]; then\
-%if %{defined ghc_version_override}\
-echo "%%dir ${pkgdir}" >> %{basepkg}.files\
-echo "%%attr(755,root,root) ${pkgdir}/libHS*-ghc%{ghc_version}.so" >> %{basepkg}.files\
-find %{buildroot}${pkgdir} -mindepth 1 -type d | sed "s/^/%dir /" >> %{basepkg}-devel.files\
-find %{buildroot}${pkgdir} ! \\( -type d -o -name "libHS*.so" \\) >> %{basepkg}-devel.files\
-%else\
 echo "%%attr(755,root,root) %{_ghcdynlibdir}/libHS%{pkgnamever}-*ghc%{ghc_version}.so" >> %{basepkg}.files\
 echo "${pkgdir}" >> %{basepkg}-devel.files\
-%endif\
 fi\
 if [ -d "%{buildroot}%{docdir}" ]; then\
 echo "%{docdir}" >> %{basepkg}-devel.files\