diff --git a/Agda.spec b/Agda.spec
index 9ad2a79..b240608 100644
--- a/Agda.spec
+++ b/Agda.spec
@@ -4,24 +4,32 @@
 %global pkg_name Agda
 %global pkgver %{pkg_name}-%{version}
 
+%global EdisonAPI EdisonAPI-1.3.1
+%global EdisonCore EdisonCore-1.3.1.1
 %global geniplatemirror geniplate-mirror-0.7.4
-%global subpkgs %{equivalence} %{geniplatemirror}
-
-%ifarch aarch64
-%define ghc_without_dynamic yes
-%endif
+%global gitrev gitrev-1.2.0
+%global ieee754 ieee754-0.8.0
+%global monadplus monadplus-1.4.2
+%global murmurhash murmur-hash-0.1.0.9
+%global subpkgs %{EdisonAPI} %{EdisonCore} %{geniplatemirror} %{gitrev} %{ieee754} %{monadplus} %{murmurhash}
 
 Name:           %{pkg_name}
 Version:        2.5.2
-Release:        1%{?dist}
+# can only be reset when all subpkgs bumped
+Release:        4%{?dist}
 Summary:        A dependently typed functional programming language and proof assistant
 
 License:        MIT and BSD
 Url:            https://hackage.haskell.org/package/%{name}
 Source0:        https://hackage.haskell.org/package/%{pkgver}/%{pkgver}.tar.gz
-Source1:        agda-mode-init.el
+Source1:        https://hackage.haskell.org/package/%{EdisonCore}/%{EdisonCore}.tar.gz
 Source2:        https://hackage.haskell.org/package/%{geniplatemirror}/%{geniplatemirror}.tar.gz
-Patch1:         Agda-HashMap.patch
+Source3:        https://hackage.haskell.org/package/%{gitrev}/%{gitrev}.tar.gz
+Source4:        https://hackage.haskell.org/package/%{ieee754}/%{ieee754}.tar.gz
+Source5:        https://hackage.haskell.org/package/%{monadplus}/%{monadplus}.tar.gz
+Source6:        https://hackage.haskell.org/package/%{murmurhash}/%{murmurhash}.tar.gz
+Source7:        https://hackage.haskell.org/package/%{EdisonAPI}/%{EdisonAPI}.tar.gz
+Source10:        agda-mode-init.el
 
 BuildRequires:  ghc-Cabal-devel
 BuildRequires:  ghc-rpm-macros-extra
@@ -29,7 +37,7 @@ BuildRequires:  ghc-rpm-macros-extra
 BuildRequires:  alex
 BuildRequires:  chrpath
 BuildRequires:  cpphs
-BuildRequires:  ghc-EdisonCore-devel
+#BuildRequires:  ghc-EdisonCore-devel
 BuildRequires:  ghc-array-devel
 BuildRequires:  ghc-binary-devel
 BuildRequires:  ghc-boxes-devel
@@ -42,14 +50,14 @@ BuildRequires:  ghc-edit-distance-devel
 BuildRequires:  ghc-equivalence-devel
 BuildRequires:  ghc-filepath-devel
 #BuildRequires:  ghc-geniplate-mirror-devel
-BuildRequires:  ghc-gitrev-devel
+#BuildRequires:  ghc-gitrev-devel
 BuildRequires:  ghc-hashable-devel
 BuildRequires:  ghc-hashtables-devel
 BuildRequires:  ghc-haskeline-devel
-BuildRequires:  ghc-ieee754-devel
-BuildRequires:  ghc-monadplus-devel
+#BuildRequires:  ghc-ieee754-devel
+#BuildRequires:  ghc-monadplus-devel
 BuildRequires:  ghc-mtl-devel
-BuildRequires:  ghc-murmur-hash-devel
+#BuildRequires:  ghc-murmur-hash-devel
 BuildRequires:  ghc-parallel-devel
 BuildRequires:  ghc-pretty-devel
 BuildRequires:  ghc-process-devel
@@ -66,8 +74,8 @@ BuildRequires:  ghc-zlib-devel
 BuildRequires:  happy
 # End cabal-rpm deps
 BuildRequires:  emacs(bin)
-# https://bugzilla.redhat.com/show_bug.cgi?id=991929
-ExcludeArch:    %{arm}
+## https://bugzilla.redhat.com/show_bug.cgi?id=991929
+#ExcludeArch:    %{arm}
 
 Requires:       ghc-%{name}-devel = %{version}-%{release}
 # introduced for F23
@@ -111,16 +119,21 @@ This package provides the Haskell %{name} library development files.
 %global main_version %{version}
 
 %if %{defined ghclibdir}
+%ghc_lib_subpackage %{EdisonAPI}
+%ghc_lib_subpackage %{EdisonCore}
 %ghc_lib_subpackage %{geniplatemirror}
+%ghc_lib_subpackage %{gitrev}
+%ghc_lib_subpackage %{ieee754}
+%ghc_lib_subpackage %{monadplus}
+%ghc_lib_subpackage %{murmurhash}
 %endif
 
 %global version %{main_version}
 
 
 %prep
-%setup -q -n %{pkgver} -a2
-%patch1 -p1 -b .orig
-cabal-tweak-dep-ver cpphs '< 1.20' '<1.21'
+%setup -q -a1 -a2 -a3 -a4 -a5 -a6 -a7
+cabal-tweak-dep-ver ieee754 '< 0.8' '< 0.9'
 
 # tweak the Agda version in the emacs mode
 if ! grep -q \"%{version}\" src/data/emacs-mode/agda2-mode.el; then
@@ -130,7 +143,7 @@ fi
 
 
 %build
-%define elisp_files eri.el agda-input.el annotation.el agda2-highlight.el agda2-abbrevs.el agda2-queue.el agda2-mode.el agda2.el
+%define elisp_files eri.el agda-input.el annotation.el agda2-highlight.el agda2-abbrevs.el agda2-queue.el agda2-mode.el agda2-mode-pkg.el agda2.el
 
 # check no missing new elisp files
 cd src/data/emacs-mode
@@ -168,7 +181,7 @@ for i in src/data/emacs-mode/*; do
 done
 
 mkdir -p %{buildroot}%{_emacs_sitestartdir}
-install -p -m 0644 %SOURCE1 %{buildroot}%{_emacs_sitestartdir}
+install -p -m 0644 %SOURCE10 %{buildroot}%{_emacs_sitestartdir}
 
 rm %{buildroot}%{_bindir}/agda-mode
 rm -r %{buildroot}%{_datadir}/%{pkgver}/emacs-mode
@@ -204,12 +217,13 @@ mv %{buildroot}%{_defaultlicensedir}/{,ghc-}%{name}
 
 
 %files -n ghc-%{name}-devel -f ghc-%{name}-devel.files
-%doc CHANGELOG
+%doc CHANGELOG.md
 
 
 %changelog
-* Sun Feb 26 2017 Jens Petersen <petersen@redhat.com> - 2.5.2-1
+* Fri Mar 10 2017 Jens Petersen <petersen@redhat.com> - 2.5.2-4
 - update to 2.5.2
+- subpackage EdisonAPI, EdisonCore, gitrev, ieee754, monadplus, murmur-hash
 
 * Fri Feb 10 2017 Fedora Release Engineering <releng@fedoraproject.org> - 2.4.2.5-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild