diff --git a/.gitignore b/.gitignore
index 697641e..59096ca 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,3 +4,4 @@
 /happstack-server-7.3.8.tar.gz
 /happstack-server-7.3.9.tar.gz
 /happstack-server-7.4.6.2.tar.gz
+/time-compat-0.1.0.3.tar.gz
diff --git a/ghc-happstack-server.spec b/ghc-happstack-server.spec
index b9c1ca9..9a2c807 100644
--- a/ghc-happstack-server.spec
+++ b/ghc-happstack-server.spec
@@ -1,6 +1,8 @@
+# generated by cabal-rpm-0.10.0
 # https://fedoraproject.org/wiki/Packaging:Haskell
 
 %global pkg_name happstack-server
+%global time_compat_version 0.1.0.3
 
 %bcond_without tests
 
@@ -12,10 +14,11 @@ Summary:        Happstack web server
 License:        BSD
 Url:            https://hackage.haskell.org/package/%{pkg_name}
 Source0:        https://hackage.haskell.org/package/%{pkg_name}-%{version}/%{pkg_name}-%{version}.tar.gz
-Patch1:         happstack-server-time-compat.patch
+# BSD license
+Source1:        http://hackage.haskell.org/package/time-compat-%{time_compat_version}/time-compat-%{time_compat_version}.tar.gz
 
 BuildRequires:  ghc-Cabal-devel
-BuildRequires:  ghc-rpm-macros
+BuildRequires:  ghc-rpm-macros-extra >= 1.6.4
 # Begin cabal-rpm deps:
 BuildRequires:  ghc-base64-bytestring-devel
 BuildRequires:  ghc-blaze-html-devel
@@ -30,7 +33,10 @@ BuildRequires:  ghc-html-devel
 BuildRequires:  ghc-monad-control-devel
 BuildRequires:  ghc-mtl-devel
 BuildRequires:  ghc-network-devel
+BuildRequires:  ghc-network-uri-devel
 BuildRequires:  ghc-old-locale-devel
+# for bundled time-compat
+BuildRequires:  ghc-old-time-devel
 BuildRequires:  ghc-parsec-devel
 BuildRequires:  ghc-process-devel
 BuildRequires:  ghc-sendfile-devel
@@ -39,6 +45,7 @@ BuildRequires:  ghc-system-filepath-devel
 BuildRequires:  ghc-template-haskell-devel
 BuildRequires:  ghc-text-devel
 BuildRequires:  ghc-threads-devel
+#BuildRequires:  ghc-time-compat-devel
 BuildRequires:  ghc-time-devel
 BuildRequires:  ghc-transformers-base-devel
 BuildRequires:  ghc-transformers-compat-devel
@@ -59,6 +66,15 @@ cookies, serving files, and more. For in-depth documentation see the Happstack
 Crash Course <http://happstack.com/docs/crashcourse/index.html>.
 
 
+%global happstack_server_version %{version}
+
+%if %{defined ghclibdir}
+%ghc_lib_subpackage time-compat %{time_compat_version}
+%endif
+
+%global version %{happstack_server_version}
+
+
 %package devel
 Summary:        Haskell %{pkg_name} library development files
 Provides:       %{name}-static = %{version}-%{release}
@@ -73,22 +89,25 @@ files.
 
 
 %prep
-%setup -q -n %{pkg_name}-%{version}
-%patch1 -p1 -b .orig
+%setup -q -n %{pkg_name}-%{version} -a1
 
 
 %build
-%ghc_lib_build
+%ghc_sublib_build time-compat-%{time_compat_version}
+
+%ghc_lib_build %{pkg_name} %{version}
 
 
 %install
-%ghc_lib_install
+%ghc_sublib_install time-compat-%{time_compat_version}
+
+%ghc_lib_install %{pkg_name} %{version}
+
+rm %{buildroot}%{ghc_pkgdocdir}/COPYING
 
 
 %check
-%if %{with tests}
-%cabal test
-%endif
+%cabal_test
 
 
 %post devel
@@ -100,7 +119,7 @@ files.
 
 
 %files -f %{name}.files
-%doc COPYING
+%license COPYING
 
 
 %files devel -f %{name}-devel.files
@@ -110,6 +129,7 @@ files.
 %changelog
 * Wed Aug 17 2016 Jens Petersen <petersen@redhat.com> - 7.4.6.2-1
 - update to 7.4.6.2
+- subpackage (bundle) time-compat-0.1.0.3
 
 * Wed Feb 03 2016 Fedora Release Engineering <releng@fedoraproject.org> - 7.3.9-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild
diff --git a/sources b/sources
index 97e8963..bb1d095 100644
--- a/sources
+++ b/sources
@@ -1 +1,2 @@
 d0cda7968f77e8896effeb1b10c0cda3  happstack-server-7.4.6.2.tar.gz
+087e9973c2f5f986fd2f4ff493fec98a  time-compat-0.1.0.3.tar.gz