diff --git a/ghc-rpm-macros.spec b/ghc-rpm-macros.spec
index 412f0b3..1f3739b 100644
--- a/ghc-rpm-macros.spec
+++ b/ghc-rpm-macros.spec
@@ -150,6 +150,7 @@ EOF
 * Thu Mar  2 2017 Jens Petersen <petersen@redhat.com> - 1.6.18-1
 - fix ghc_fix_rpath, ghc_gen_filelists, and ghc-deps.sh when pkg-ver already
   installed
+- ghc_bin_install and ghc_lib_install now run ghc_fix_rpath on subpkgs
 
 * Wed Feb 22 2017 Jens Petersen <petersen@redhat.com> - 1.6.17-1
 - setup --global/--user in cabal_configure
diff --git a/macros.ghc b/macros.ghc
index 277bbed..8431003 100644
--- a/macros.ghc
+++ b/macros.ghc
@@ -146,6 +146,7 @@ find %{buildroot} -type f -exec sh -c "file {} | grep -q 'dynamically linked'" \
 %{!?_fileattrsdir:%global __find_requires %{_rpmconfigdir}/ghc-deps.sh %{buildroot}%{ghclibdir}}\
 %cabal_install\
 %{!?1:%ghc_strip_dynlinked}\
+%{?ghc_subpackaging:%ghc_fix_rpath %{subpkgs}}\
 %{nil}
 
 # ghc_lib_install [name] [version]
@@ -157,6 +158,7 @@ find %{buildroot} -type f -exec sh -c "file {} | grep -q 'dynamically linked'" \
 %cabal_pkg_conf\
 %ghc_gen_filelists\
 %{!?1:%ghc_strip_dynlinked}\
+%{?ghc_subpackaging:%ghc_fix_rpath %{subpkgs}}\
 %{nil}
 
 # ghc_fix_rpath lib-ver ...