diff --git a/cabal-install.spec b/cabal-install.spec
index 2c53bab..104017b 100644
--- a/cabal-install.spec
+++ b/cabal-install.spec
@@ -1,29 +1,21 @@
 # generated by cabal-rpm-0.11.1
 # https://fedoraproject.org/wiki/Packaging:Haskell
 
-%global ed25519 ed25519-0.0.5.0
-%global cryptohashsha256 cryptohash-sha256-0.11.100.1
-%global hackagesecurity hackage-security-0.5.2.2
-%global subpkgs %{ed25519} %{cryptohashsha256} %{hackagesecurity}
-
 %bcond_with tests
 
 Name:           cabal-install
-# can only be reset when all subpkgs bumped
 Version:        1.24.0.2
-Release:        5%{?dist}
+Release:        6%{?dist}
 Summary:        The command-line interface for Cabal and Hackage
 
 License:        BSD
 Url:            https://hackage.haskell.org/package/%{name}
 Source0:        https://hackage.haskell.org/package/%{name}-%{version}/%{name}-%{version}.tar.gz
-Source1:        https://hackage.haskell.org/package/%{cryptohashsha256}/%{cryptohashsha256}.tar.gz
-Source2:        https://hackage.haskell.org/package/%{hackagesecurity}/%{hackagesecurity}.tar.gz
-Source3:        https://hackage.haskell.org/package/%{ed25519}/%{ed25519}.tar.gz
+Source1:        https://hackage.haskell.org/package/%{hackagesecurity}/%{hackagesecurity}.tar.gz
 Source10:        cabal-install.sh
 
 BuildRequires:  ghc-Cabal-devel
-BuildRequires:  ghc-rpm-macros-extra
+BuildRequires:  ghc-rpm-macros
 # Begin cabal-rpm deps:
 BuildRequires:  ghc-HTTP-devel
 BuildRequires:  ghc-array-devel
@@ -32,10 +24,10 @@ BuildRequires:  ghc-base16-bytestring-devel
 BuildRequires:  ghc-binary-devel
 BuildRequires:  ghc-bytestring-devel
 BuildRequires:  ghc-containers-devel
-#BuildRequires:  ghc-cryptohash-sha256-devel
+BuildRequires:  ghc-cryptohash-sha256-devel
 BuildRequires:  ghc-directory-devel
 BuildRequires:  ghc-filepath-devel
-#BuildRequires:  ghc-hackage-security-devel
+BuildRequires:  ghc-hackage-security-devel
 BuildRequires:  ghc-hashable-devel
 BuildRequires:  ghc-mtl-devel
 BuildRequires:  ghc-network-devel
@@ -57,9 +49,6 @@ BuildRequires:  ghc-tasty-hunit-devel
 BuildRequires:  ghc-tasty-quickcheck-devel
 %endif
 # End cabal-rpm deps
-# for hackage-security
-BuildRequires:  ghc-base64-bytestring-devel
-BuildRequires:  ghc-template-haskell-devel
 
 Requires:       ghc-Cabal-devel
 # for /etc/bash_completion.d/
@@ -74,37 +63,18 @@ Obsoletes:      %{name}-static < %{version}-%{release}
 %description
 The 'cabal' command-line program simplifies the process of managing Haskell
 software by automating the fetching, configuration, compilation and
-installation of Haskell libraries and programs from Hackage.
-
-
-%global main_version %{version}
-
-%if %{defined ghclibdir}
-%ghc_lib_subpackage %{ed25519}
-%ghc_lib_subpackage %{cryptohashsha256}
-%ghc_lib_subpackage %{hackagesecurity}
-%endif
-
-%global version %{main_version}
+installation of Haskell libraries and programs.
 
 
 %prep
-%setup -q -a1 -a2 -a3
-
-cd %{hackagesecurity}
-cabal-tweak-dep-ver directory '< 1.3' '< 1.4'
-
-cd ../%{ed25519}
-cabal-tweak-dep-ver ghc-prim '< 0.5' '< 0.6'
+%setup -q
 
 
 %build
-%ghc_libs_build %{subpkgs}
 %ghc_bin_build
 
 
 %install
-%ghc_libs_install %{subpkgs}
 %ghc_bin_install
 
 mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/bash_completion.d
@@ -128,6 +98,9 @@ install -pm 644 %{SOURCE10} $RPM_BUILD_ROOT%{_sysconfdir}/profile.d
 
 
 %changelog
+* Sat Oct 21 2017 Jens Petersen <petersen@fedoraproject.org> - 1.24.0.2-6
+- the bundled libraries are now packaged in Fedora
+
 * Wed Aug 02 2017 Fedora Release Engineering <releng@fedoraproject.org> - 1.24.0.2-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild