diff --git a/ghc-7.8.3-i386-unknown-linux-centos65.tar.bz2 b/ghc-7.8.3-i386-unknown-linux-centos65.tar.bz2
new file mode 100644
index 0000000..7470c08
--- /dev/null
+++ b/ghc-7.8.3-i386-unknown-linux-centos65.tar.bz2
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:38c61b7535644dbc0fc0e484752e1f3db6326569663658a93cb609e8ad05feaa
+size 120180306
diff --git a/ghc-7.8.3-powerpc-unknown-linux.tar.bz2 b/ghc-7.8.3-powerpc-unknown-linux.tar.bz2
new file mode 100644
index 0000000..7bc169b
--- /dev/null
+++ b/ghc-7.8.3-powerpc-unknown-linux.tar.bz2
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:9e7baa80ecdb263ec8c577760817b16d32ba73ba0ebd48004d7a69899e826496
+size 60476033
diff --git a/ghc-7.8.3-powerpc64-unknown-linux.tar.bz2 b/ghc-7.8.3-powerpc64-unknown-linux.tar.bz2
new file mode 100644
index 0000000..1c98cf4
--- /dev/null
+++ b/ghc-7.8.3-powerpc64-unknown-linux.tar.bz2
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:dcf0af948d9146141347b4ac21ce604c63f84034cf993a8e147e4d8ce387bf12
+size 87051271
diff --git a/ghc-7.8.3-powerpc64le-unknown-linux.tar.bz2 b/ghc-7.8.3-powerpc64le-unknown-linux.tar.bz2
new file mode 100644
index 0000000..7708a6d
--- /dev/null
+++ b/ghc-7.8.3-powerpc64le-unknown-linux.tar.bz2
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:c5e2c51664c7db740be79c882c72fcd16036f84dff1b65ab0e9749b882ed31b6
+size 107100129
diff --git a/ghc-7.8.3-x86_64-unknown-linux-centos65.tar.bz2 b/ghc-7.8.3-x86_64-unknown-linux-centos65.tar.bz2
new file mode 100644
index 0000000..88fdae2
--- /dev/null
+++ b/ghc-7.8.3-x86_64-unknown-linux-centos65.tar.bz2
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:7561f2685063a49e46430050c057e801f210cc56c7fb2cab0951a6444a72c4f7
+size 113299736
diff --git a/ghc-7.8.4-aarch64-unknown-linux.tar.bz2 b/ghc-7.8.4-aarch64-unknown-linux.tar.bz2
new file mode 100644
index 0000000..926f293
--- /dev/null
+++ b/ghc-7.8.4-aarch64-unknown-linux.tar.bz2
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:7719ee27ae756eae2458bb8ade69a8c29c28d26d6ea8be36a73e5d003dd7024a
+size 87692219
diff --git a/ghc-7.8.4-s390-ibm-linux.tar.bz2 b/ghc-7.8.4-s390-ibm-linux.tar.bz2
new file mode 100644
index 0000000..e3e7c91
--- /dev/null
+++ b/ghc-7.8.4-s390-ibm-linux.tar.bz2
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:cc7cb331aa41ff4c19fba1b72e1847533070d62d022ff282058a8d5969c49630
+size 100269236
diff --git a/ghc-7.8.4-s390x-ibm-linux.tar.bz2 b/ghc-7.8.4-s390x-ibm-linux.tar.bz2
new file mode 100644
index 0000000..085145b
--- /dev/null
+++ b/ghc-7.8.4-s390x-ibm-linux.tar.bz2
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:dde3e49eadcd8e537563b5925c2f0321f7a44b05826223aee2aa836e68bf7b46
+size 97006937
diff --git a/ghc-bootstrap-7.8.3.tar b/ghc-bootstrap-7.8.3.tar
index 1f8f355..f37a743 100644
--- a/ghc-bootstrap-7.8.3.tar
+++ b/ghc-bootstrap-7.8.3.tar
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:521a6838fb6ee9273a3b6a12ee177066fa03f6e9791d92bc9b5cb61ffb2b4d7a
-size 488120320
+oid sha256:ceec3278ddaf2c71a879710026c2669acb31e3681f728ce5f0f2e506ef07f871
+size 10240
diff --git a/ghc-bootstrap.changes b/ghc-bootstrap.changes
index fbd8d32..16a88cf 100644
--- a/ghc-bootstrap.changes
+++ b/ghc-bootstrap.changes
@@ -1,3 +1,13 @@
+-------------------------------------------------------------------
+Thu May 21 18:40:43 CEST 2015 - ro@suse.de
+
+- add 7.8.4 tarball for aarch64 
+
+-------------------------------------------------------------------
+Thu May 21 12:09:20 CEST 2015 - ro@suse.de
+
+- add 7.8.4 tarball for s390 and s390x
+
 -------------------------------------------------------------------
 Fri May  1 17:06:42 UTC 2015 - peter.trommler@ohm-hochschule.de
 
diff --git a/ghc-bootstrap.spec b/ghc-bootstrap.spec
index a185d2f..cea6af0 100644
--- a/ghc-bootstrap.spec
+++ b/ghc-bootstrap.spec
@@ -29,10 +29,29 @@
 %ifarch ppc64le
 %define longarch powerpc64le
 %endif
+%ifarch s390
+%define longarch s390
+%endif
+%ifarch s390x
+%define longarch s390x
+%endif
+%ifarch aarch64
+%define longarch aarch64
+%endif
 %ifarch x86_64
 %define longarch x86_64
 %define os_release -centos65
 %endif
+%ifarch aarch64 s390 s390x
+%define xversion 7.8.4
+%else
+%define xversion 7.8.3
+%endif
+%ifarch s390 s390x
+%define sysname ibm
+%else
+%define sysname unknown
+%endif
 
 %global without_hscolour 1
 
@@ -48,12 +67,20 @@ Group:          Development/Languages/Other
 Source:         %{name}-%{version}.tar
 Source1:        README.openSUSE
 Source2:        LICENSE
+Source10:       ghc-7.8.3-i386-unknown-linux-centos65.tar.bz2
+Source11:       ghc-7.8.3-powerpc-unknown-linux.tar.bz2
+Source12:       ghc-7.8.3-powerpc64-unknown-linux.tar.bz2
+Source13:       ghc-7.8.3-powerpc64le-unknown-linux.tar.bz2
+Source14:       ghc-7.8.3-x86_64-unknown-linux-centos65.tar.bz2
+Source15:       ghc-7.8.4-s390-ibm-linux.tar.bz2
+Source16:       ghc-7.8.4-s390x-ibm-linux.tar.bz2
+Source17:       ghc-7.8.4-aarch64-unknown-linux.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 BuildRequires:  fdupes
 BuildRequires:  gmp-devel
 Requires:       gmp-devel
 
-ExclusiveArch:  %{ix86} ppc ppc64 ppc64le x86_64
+ExclusiveArch:  %{ix86} ppc ppc64 ppc64le x86_64 s390 s390x aarch64
 Provides:       ghc-bootstrap-devel
 
 Conflicts:      ghc
@@ -114,21 +141,29 @@ Haskell home page at <http://www.haskell.org/>.
 %setup -q
 cp %SOURCE1 .
 cp %SOURCE2 .
+cp %SOURCE10 .
+cp %SOURCE11 .
+cp %SOURCE12 .
+cp %SOURCE13 .
+cp %SOURCE14 .
+cp %SOURCE15 .
+cp %SOURCE16 .
+cp %SOURCE17 .
 
 %build
 %if 0%{suse_version} > 1130
 ln -s %{_libdir}/libgmp.so.10 libgmp.so.3
 export LD_LIBRARY_PATH=`pwd`:$LD_LIBRARY_PATH
 %endif
-tar jxf ghc-%{version}-%{longarch}-unknown-linux%{?os_release}.tar.bz2
-cd ghc-%{version}
+tar jxf ghc-%{xversion}-%{longarch}-%{sysname}-linux%{?os_release}.tar.bz2
+cd ghc-%{xversion}
 ./configure --prefix=%{_prefix}
 
 %install
 %if 0%{suse_version} > 1130
 export LD_LIBRARY_PATH=`pwd`:$LD_LIBRARY_PATH
 %endif
-cd ghc-%{version}
+cd ghc-%{xversion}
 %makeinstall
 %if 0%{suse_version} > 1130
 install -dm 0755 %{buildroot}%{_libdir}
@@ -144,7 +179,7 @@ ghc-pkg recache
 %doc README.openSUSE
 %doc LICENSE
 %{_bindir}/*
-%{_prefix}/lib/ghc-%{version}
+%{_prefix}/lib/ghc-%{xversion}
 %{_datadir}/doc/*
 %if 0%{suse_version} > 1130
 %{_libdir}/libgmp.so.3