diff --git a/alex-3.2.5.tar.gz b/alex-3.2.5.tar.gz
new file mode 100644
index 0000000..82dcc3c
--- /dev/null
+++ b/alex-3.2.5.tar.gz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:b77c8a1270767c64e2adb21a6e91ee7cd904ba17edae17bc20fd03da5256e0e3
+size 108531
diff --git a/ghc-bootstrap-helpers.changes b/ghc-bootstrap-helpers.changes
index 23bdc55..071580e 100644
--- a/ghc-bootstrap-helpers.changes
+++ b/ghc-bootstrap-helpers.changes
@@ -1,3 +1,13 @@
+-------------------------------------------------------------------
+Sat Jan 18 09:08:42 UTC 2020 - Peter Trommler <ptrommler@icloud.com>
+
+- improve packaging and avoid rpmlint warning 
+
+-------------------------------------------------------------------
+Fri Jan 17 18:57:31 UTC 2020 - Peter Trommler <ptrommler@icloud.com>
+
+- build happy and alex form source using ghc-bootstrap
+
 -------------------------------------------------------------------
 Sun Dec 29 13:00:54 UTC 2019 - Ondřej Súkup <mimi.vx@gmail.com>
 
diff --git a/ghc-bootstrap-helpers.spec b/ghc-bootstrap-helpers.spec
index 9979e22..c7ed55a 100644
--- a/ghc-bootstrap-helpers.spec
+++ b/ghc-bootstrap-helpers.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package ghc-bootstrap-helpers
 #
-# Copyright (c) 2019 SUSE LLC
+# Copyright (c) 2020 SUSE LINUX GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -22,8 +22,12 @@ Release:        0
 Summary:        Dependencies to build ghc
 License:        BSD-3-Clause AND BSD-2-Clause
 URL:            https://build.opensuse.org/project/show/devel:languages:haskell
-Source:         helpers.tar.gz
-ExclusiveArch:  x86_64
+Source:         alex-3.2.5.tar.gz
+Source1:        happy-1.19.12.tar.gz
+BuildRequires:  ghc-bootstrap
+# This package is not meant to be used outside OBS
+Requires:       this-is-only-for-build-envs
+
 Conflicts:      alex
 Conflicts:      happy
 
@@ -31,24 +35,37 @@ Conflicts:      happy
 Prebuild alex and happy for ghc-8.8+ build
 
 Don't use outside GHC-8.8+ build
+% ' Help EMACS syntax highlighting
 
 %prep
-%setup -q
+%setup -q -c -a0 -a1
 
 %build
+pushd alex-3.2.5
+/opt/bin/ghc Setup.hs -o cabal
+./cabal configure --prefix=%{_prefix}
+./cabal build
+popd
+
+pushd happy-1.19.12
+/opt/bin/ghc Setup.hs -o cabal
+./cabal configure --prefix=%{_prefix}
+./cabal build
+popd
 
 %install
-cp -R * %{buildroot}/
-rm -Rf %{buildroot}%{_datadir}/doc/*
-rm -Rf %{buildroot}/usr/share/man/
-rm -Rf %{buildroot}/usr/share/licenses/
+pushd alex-3.2.5
+./cabal copy --destdir=%{buildroot}
+popd
+
+pushd happy-1.19.12
+./cabal copy --destdir=%{buildroot}
+popd
 
 %files
 %{_bindir}/alex
 %{_bindir}/happy
-%dir %{_datadir}/happy-1.19.12/
-%dir %{_datadir}/alex-3.2.5/
-%{_datadir}/alex-3.2.5/*
-%{_datadir}/happy-1.19.12/*
+%{_datadir}/*ghc*
+%{_datadir}/doc/*ghc*
 
 %changelog
diff --git a/happy-1.19.12.tar.gz b/happy-1.19.12.tar.gz
new file mode 100644
index 0000000..3ec8655
--- /dev/null
+++ b/happy-1.19.12.tar.gz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:fb9a23e41401711a3b288f93cf0a66db9f97da1ce32ec4fffea4b78a0daeb40f
+size 183254
diff --git a/helpers.tar.gz b/helpers.tar.gz
deleted file mode 100644
index 19fbb28..0000000
--- a/helpers.tar.gz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:008d2bb0f939e993260c05c9fdffaef02027849487ffe8740571adc8edf2858f
-size 1276411