diff --git a/ghc-data-default.spec b/ghc-data-default.spec
index 6c895ba..de1e988 100644
--- a/ghc-data-default.spec
+++ b/ghc-data-default.spec
@@ -4,32 +4,22 @@
 %global pkg_name data-default
 %global pkgver %{pkg_name}-%{version}
 
-%global instancescontainers data-default-instances-containers-0.0.1
-%global instancesdlist data-default-instances-dlist-0.0.1
-%global instancesoldlocale data-default-instances-old-locale-0.0.1
-%global subpkgs %{instancescontainers} %{instancesdlist} %{instancesoldlocale}
-
 Name:           ghc-%{pkg_name}
 Version:        0.7.1.1
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        A class for types with a default value
 
 License:        BSD
 Url:            https://hackage.haskell.org/package/%{pkg_name}
 Source0:        https://hackage.haskell.org/package/%{pkgver}/%{pkgver}.tar.gz
-Source1:        https://hackage.haskell.org/package/%{instancescontainers}/%{instancescontainers}.tar.gz
-Source2:        https://hackage.haskell.org/package/%{instancesdlist}/%{instancesdlist}.tar.gz
-Source3:        https://hackage.haskell.org/package/%{instancesoldlocale}/%{instancesoldlocale}.tar.gz
 
 BuildRequires:  ghc-Cabal-devel
-BuildRequires:  ghc-rpm-macros-extra
+BuildRequires:  ghc-rpm-macros
 # Begin cabal-rpm deps:
 BuildRequires:  ghc-data-default-class-devel
-#BuildRequires:  ghc-data-default-instances-containers-devel
-BuildRequires:  ghc-dlist-devel
-#BuildRequires:  ghc-data-default-instances-dlist-devel
-BuildRequires:  ghc-old-locale-devel
-#BuildRequires:  ghc-data-default-instances-old-locale-devel
+BuildRequires:  ghc-data-default-instances-containers-devel
+BuildRequires:  ghc-data-default-instances-dlist-devel
+BuildRequires:  ghc-data-default-instances-old-locale-devel
 # End cabal-rpm deps
 
 %description
@@ -51,28 +41,15 @@ Requires:       %{name}%{?_isa} = %{version}-%{release}
 This package provides the Haskell %{pkg_name} library development files.
 
 
-%global main_version %{version}
-
-%if %{defined ghclibdir}
-%ghc_lib_subpackage %{instancescontainers}
-%ghc_lib_subpackage %{instancesdlist}
-%ghc_lib_subpackage %{instancesoldlocale}
-%endif
-
-%global version %{main_version}
-
-
 %prep
-%setup -q -n %{pkgver} -a1 -a2 -a3
+%setup -q -n %{pkgver}
 
 
 %build
-%ghc_libs_build %{subpkgs}
 %ghc_lib_build
 
 
 %install
-%ghc_libs_install %{subpkgs}
 %ghc_lib_install
 
 
@@ -98,6 +75,9 @@ This package provides the Haskell %{pkg_name} library development files.
 
 
 %changelog
+* Mon Jan 29 2018 Jens Petersen <petersen@redhat.com> - 0.7.1.1-5
+- data-default-instances-* now packaged
+
 * Fri Jan 26 2018 Jens Petersen <petersen@redhat.com> - 0.7.1.1-4
 - rebuild
 
diff --git a/sources b/sources
index b2a56de..cdc44a3 100644
--- a/sources
+++ b/sources
@@ -1,4 +1 @@
-SHA512 (data-default-instances-old-locale-0.0.1.tar.gz) = bbaf4626c922820dca8cc230585fef80b6f6bd6278d335cc7abd4e5b7a857f0626ca9937ea95066e7655387dfcc684e6fbb0f6f5bc6905e539fbd1176ddd99ec
-SHA512 (data-default-instances-dlist-0.0.1.tar.gz) = b3794c296d5f1ca54badaab4c267b302967ce73ac649d8df031daafa17f66537bf670ee42fda1b75b92998eb4b8862c1e0a9bdd3716c31dfd0937c3c76b6f03d
-SHA512 (data-default-instances-containers-0.0.1.tar.gz) = a12352eb0484ad772b16674b2ef8145b3733473f716c182841d6378d8a2d3b196e8fc966afd7c335e81e924ea83088a9c67c4aaddb14a87a7a816cbe27236bfd
 SHA512 (data-default-0.7.1.1.tar.gz) = a31260c71178641e41f16fc504620f19ad04a44d2d095c96225b6027184c01ec0bf47effab5344816e438d7c37e34189255a9d3a5d643219b37054dde679d1bd