diff --git a/.gitignore b/.gitignore
index 039256c..934839d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -16,3 +16,8 @@
 /hslua-aeson-2.3.0.1.tar.gz
 /hslua-classes-2.3.0.tar.gz
 /hslua-typing-0.1.0.tar.gz
+/hslua-core-2.3.1.tar.gz
+/hslua-marshalling-2.3.0.tar.gz
+/hslua-objectorientation-2.3.0.tar.gz
+/hslua-packaging-2.3.0.tar.gz
+/lua-2.3.1.tar.gz
diff --git a/ghc-hslua.spec b/ghc-hslua.spec
index c8a1dc8..b9f3594 100644
--- a/ghc-hslua.spec
+++ b/ghc-hslua.spec
@@ -6,10 +6,15 @@
 %global pkg_name hslua
 %global pkgver %{pkg_name}-%{version}
 
+%global hsluacore hslua-core-2.3.1
+%global hsluamarshalling hslua-marshalling-2.3.0
+%global hsluaobjectorientation hslua-objectorientation-2.3.0
+%global hsluapackaging hslua-packaging-2.3.0
+%global lua_hs lua-2.3.1
 %global hsluaaeson hslua-aeson-2.3.0.1
 %global hsluaclasses hslua-classes-2.3.0
 %global hsluatyping hslua-typing-0.1.0
-%global subpkgs %{hsluaaeson} %{hsluaclasses} %{hsluatyping}
+%global subpkgs %{lua_hs} %{hsluacore} %{hsluamarshalling} %{hsluatyping} %{hsluaobjectorientation} %{hsluapackaging} %{hsluaaeson} %{hsluaclasses}
 
 # testsuite missing deps: lua-arbitrary quickcheck-instances tasty-hslua
 
@@ -23,9 +28,14 @@ License:        MIT
 Url:            https://hackage.haskell.org/package/%{pkg_name}
 # Begin cabal-rpm sources:
 Source0:        https://hackage.haskell.org/package/%{pkgver}/%{pkgver}.tar.gz
-Source1:        https://hackage.haskell.org/package/%{hsluaaeson}/%{hsluaaeson}.tar.gz
-Source2:        https://hackage.haskell.org/package/%{hsluaclasses}/%{hsluaclasses}.tar.gz
-Source3:        https://hackage.haskell.org/package/%{hsluatyping}/%{hsluatyping}.tar.gz
+Source1:        https://hackage.haskell.org/package/%{hsluacore}/%{hsluacore}.tar.gz
+Source2:        https://hackage.haskell.org/package/%{hsluamarshalling}/%{hsluamarshalling}.tar.gz
+Source3:        https://hackage.haskell.org/package/%{hsluaobjectorientation}/%{hsluaobjectorientation}.tar.gz
+Source4:        https://hackage.haskell.org/package/%{hsluapackaging}/%{hsluapackaging}.tar.gz
+Source5:        https://hackage.haskell.org/package/%{lua_hs}/%{lua_hs}.tar.gz
+Source6:        https://hackage.haskell.org/package/%{hsluaaeson}/%{hsluaaeson}.tar.gz
+Source7:        https://hackage.haskell.org/package/%{hsluaclasses}/%{hsluaclasses}.tar.gz
+Source8:        https://hackage.haskell.org/package/%{hsluatyping}/%{hsluatyping}.tar.gz
 # End cabal-rpm sources
 
 # Begin cabal-rpm deps:
@@ -37,10 +47,10 @@ BuildRequires:  ghc-containers-devel
 BuildRequires:  ghc-exceptions-devel
 #BuildRequires:  ghc-hslua-aeson-devel
 #BuildRequires:  ghc-hslua-classes-devel
-BuildRequires:  ghc-hslua-core-devel
-BuildRequires:  ghc-hslua-marshalling-devel
-BuildRequires:  ghc-hslua-objectorientation-devel
-BuildRequires:  ghc-hslua-packaging-devel
+#BuildRequires:  ghc-hslua-core-devel
+#BuildRequires:  ghc-hslua-marshalling-devel
+#BuildRequires:  ghc-hslua-objectorientation-devel
+#BuildRequires:  ghc-hslua-packaging-devel
 #BuildRequires:  ghc-hslua-typing-devel
 BuildRequires:  ghc-mtl-devel
 BuildRequires:  ghc-text-devel
@@ -51,10 +61,10 @@ BuildRequires:  ghc-containers-prof
 BuildRequires:  ghc-exceptions-prof
 #BuildRequires:  ghc-hslua-aeson-prof
 #BuildRequires:  ghc-hslua-classes-prof
-BuildRequires:  ghc-hslua-core-prof
-BuildRequires:  ghc-hslua-marshalling-prof
-BuildRequires:  ghc-hslua-objectorientation-prof
-BuildRequires:  ghc-hslua-packaging-prof
+#BuildRequires:  ghc-hslua-core-prof
+#BuildRequires:  ghc-hslua-marshalling-prof
+#BuildRequires:  ghc-hslua-objectorientation-prof
+#BuildRequires:  ghc-hslua-packaging-prof
 #BuildRequires:  ghc-hslua-typing-prof
 BuildRequires:  ghc-mtl-prof
 BuildRequires:  ghc-text-prof
@@ -76,13 +86,16 @@ BuildRequires:  ghc-vector-prof
 %if %{with system_lua}
 BuildRequires:  lua-devel
 %else
-Provides:       bundled(lua) = 5.3.6
+Provides:       bundled(lua) = 5.4.4
 %endif
 
 %description
 HsLua provides bindings, wrappers, types, and helper functions to bridge
 Haskell and Lua.
 
+It builds upon the lua package, which allows to bundle a Lua interpreter
+with a Haskell program.
+
 Example programs are available in <https://github.com/hslua/hslua-examples>.
 
 %package devel
@@ -128,6 +141,11 @@ This package provides the Haskell %{pkg_name} profiling library.
 %global main_version %{version}
 
 %if %{defined ghclibdir}
+%ghc_lib_subpackage -l MIT %{hsluacore}
+%ghc_lib_subpackage -l MIT %{hsluamarshalling}
+%ghc_lib_subpackage -l MIT %{hsluaobjectorientation}
+%ghc_lib_subpackage -l MIT %{hsluapackaging}
+%ghc_lib_subpackage -l MIT %{lua_hs}
 %ghc_lib_subpackage -l MIT %{hsluaaeson}
 %ghc_lib_subpackage -l MIT %{hsluaclasses}
 %ghc_lib_subpackage -l MIT %{hsluatyping}
@@ -138,7 +156,7 @@ This package provides the Haskell %{pkg_name} profiling library.
 
 %prep
 # Begin cabal-rpm setup:
-%setup -q -n %{pkgver} -a1 -a2 -a3
+%setup -q -n %{pkgver} -a1 -a2 -a3 -a4 -a5 -a6 -a7 -a8
 # End cabal-rpm setup
 %if %{with system_lua}
 cabal-tweak-flag system-lua True
diff --git a/sources b/sources
index f5082d1..f9cb023 100644
--- a/sources
+++ b/sources
@@ -1,4 +1,9 @@
 SHA512 (hslua-2.3.0.tar.gz) = a3e4bd970d0a55465aafff91f6b03d29443599d819a48dc9f3296bcac5807c9cb2920cb5c6c5e3bda854403a5bea219b9a626305d932f8c452ff9cc09572d060
+SHA512 (hslua-core-2.3.1.tar.gz) = 840ab7f7a17c34ec00c84b3b7ae80a9c0842ac117d61f938fb8900c0685a41d91006d154898b04e69eb9cd79d08e0e1d8f53e464e6038f08fe15b9570bbad947
+SHA512 (hslua-marshalling-2.3.0.tar.gz) = b5ebc33f4f4e5b5dd60de60a9bf73cf97b040674a0c0c5a0815f5dada18745061559abf7bfc1cfe5034d0f27ee967eadc9dc287c064d8ff593e3cedb01b771fd
+SHA512 (hslua-objectorientation-2.3.0.tar.gz) = 648dd92b7b51d8edfc8fcf455e3ae87afc828aeb4f5e54cb7d4f23d0e12173369ecac6ac44a79ddb474e723d1b007615492018d375aa7a4d58abbd13752a84e3
+SHA512 (hslua-packaging-2.3.0.tar.gz) = 6b5b8f4bfda3798467bae4a7433f3c0ecbaaa9d3392d2fe51cc06d8b3d8ac05b1c9d32b3606ce6347bcbd43b39c583f640e7921befc095c4779db396450f5b4f
+SHA512 (lua-2.3.1.tar.gz) = 3fd5c4d55fdb7480ffc629e7dfd9fb31b7376ca4245e9db098fce7dc4dbdf1a576f521f55902bdf484ad9b4bbfab4a565de4e1528a1cb4296682508ccb977686
 SHA512 (hslua-aeson-2.3.0.1.tar.gz) = 0934ba51a554f8f889340d6f28739028c07ac26e935bd68cea85d6221b0092531f41a0c28bb99d47c0725b4947dcf4742c25f42fe3cc4ef7553158f92a7e06a5
 SHA512 (hslua-classes-2.3.0.tar.gz) = 07daa9b31bf4d3c8ec24bff67219cdcaf58ec56d45ac4c1b000aceccbbd90a79748f6786497c3a79e7c2670442859e1f31b200455cf2b26eb0dc4d699f9345ba
 SHA512 (hslua-typing-0.1.0.tar.gz) = caca4003fab2fab4920e43491dc56cd137198f4a312d654f9489ea841b5e18b1b528a46e493692d027500a2fc5201d6f39b49b8bf0af8c199dbe357b95ccfb1f