diff --git a/.gitignore b/.gitignore
index 0a8b4b2..d2bf0a4 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,3 +4,4 @@
 /yaml-0.8.8.2.tar.gz
 /yaml-0.8.10.tar.gz
 /yaml-0.8.18.1.tar.gz
+/enclosed-exceptions-1.0.2.tar.gz
diff --git a/ghc-yaml.spec b/ghc-yaml.spec
index 1805773..e70fa9b 100644
--- a/ghc-yaml.spec
+++ b/ghc-yaml.spec
@@ -1,6 +1,8 @@
+# generated by cabal-rpm-0.10.1
 # https://fedoraproject.org/wiki/Packaging:Haskell
 
 %global pkg_name yaml
+%global subpkgver enclosed-exceptions-1.0.2
 
 %bcond_with tests
 
@@ -12,6 +14,7 @@ Summary:        Support for parsing and rendering YAML documents
 License:        BSD
 Url:            https://hackage.haskell.org/package/%{pkg_name}
 Source0:        https://hackage.haskell.org/package/%{pkg_name}-%{version}/%{pkg_name}-%{version}.tar.gz
+Source1:        http://hackage.haskell.org/package/%{subpkgver}/%{subpkgver}.tar.gz
 
 BuildRequires:  ghc-Cabal-devel
 BuildRequires:  ghc-rpm-macros
@@ -23,7 +26,7 @@ BuildRequires:  ghc-bytestring-devel
 BuildRequires:  ghc-conduit-devel
 BuildRequires:  ghc-containers-devel
 BuildRequires:  ghc-directory-devel
-BuildRequires:  ghc-enclosed-exceptions-devel
+#BuildRequires:  ghc-enclosed-exceptions-devel
 BuildRequires:  ghc-filepath-devel
 BuildRequires:  ghc-resourcet-devel
 BuildRequires:  ghc-scientific-devel
@@ -66,28 +69,35 @@ Requires:       pkgconfig(yaml-0.1)
 This package provides the Haskell %{pkg_name} library development files.
 
 
-%prep
-%setup -q -n %{pkg_name}-%{version}
+%global main_version %{version}
+
+%if %{defined ghclibdir}
+%ghc_lib_subpackage %{subpkgver}
+%endif
+
+%global version %{main_version}
 
+
+%prep
+%setup -q -c -n %{pkg_name}-%{version} -a1
+cd %{pkg_name}-%{version}
 cabal-tweak-flag system-libyaml True
 # remove the bundled lib
 rm -r libyaml
 
 
 %build
-%ghc_lib_build
+%ghc_libs_build %{subpkgver} %{pkg_name}-%{version}
 
 
 %install
-%ghc_lib_install
+%ghc_libs_install time-locale-compat-%{time_locale_compat_version} %{pkg_name}-%{version}
 
 %ghc_fix_dynamic_rpath json2yaml yaml2json
 
 
 %check
-%if %{with tests}
-%cabal test
-%endif
+%cabal_test
 
 
 %post devel
@@ -99,11 +109,10 @@ rm -r libyaml
 
 
 %files -f %{name}.files
-%doc LICENSE
 
 
 %files devel -f %{name}-devel.files
-%doc README.md
+%doc ChangeLog.md README.md examples
 %{_bindir}/json2yaml
 %{_bindir}/yaml2json
 
@@ -111,6 +120,7 @@ rm -r libyaml
 %changelog
 * Wed Aug 31 2016 Jens Petersen <petersen@redhat.com> - 0.8.18.1-1
 - update to 0.8.18.1
+- subpackage enclosed-exceptions dep
 
 * Wed Feb 03 2016 Fedora Release Engineering <releng@fedoraproject.org> - 0.8.10-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild
diff --git a/sources b/sources
index 1d97725..9309ee0 100644
--- a/sources
+++ b/sources
@@ -1 +1,2 @@
+2bcd17eba9cb1ebcb8da5fbccfbc6101  enclosed-exceptions-1.0.2.tar.gz
 3f19c449c65c35d8c3785e11e61e611e  yaml-0.8.18.1.tar.gz