diff --git a/baselibs.conf b/baselibs.conf
new file mode 100644
index 0000000..22101a0
--- /dev/null
+++ b/baselibs.conf
@@ -0,0 +1,12 @@
+arch x86_64 targets s390x:64bit
+
+targetname <name>-x86_64
+
+arch x86_64 package syslinux
+	conflicts "syslinux"
+	+.*
+	-/usr/bin/syslinux
+	-/usr/bin/extlinux 
+	-/usr/bin/gethostip
+	-/usr/bin/isohybrid
+	-/usr/bin/memdiskfind
diff --git a/syslinux-4.04-align.diff b/syslinux-4.04-align.diff
new file mode 100644
index 0000000..551843b
--- /dev/null
+++ b/syslinux-4.04-align.diff
@@ -0,0 +1,11 @@
+--- core/syslinux.ld
++++ core/syslinux.ld
+@@ -263,7 +263,7 @@
+ 		__text_end = .;
+ 	}
+ 
+-	. = ALIGN(16);
++	. = ALIGN(32);
+ 
+ 	__rodata_vma = .;
+ 	__rodata_lma = __rodata_vma + __text_lma - __text_vma;
diff --git a/syslinux.changes b/syslinux.changes
index 0302ad4..a35f6ce 100644
--- a/syslinux.changes
+++ b/syslinux.changes
@@ -1,3 +1,13 @@
+-------------------------------------------------------------------
+Wed Mar 16 13:56:48 CET 2016 - snwint@suse.de
+
+- syslinux-4.04-align.diff: fix section alignment (bsc#948445)
+
+-------------------------------------------------------------------
+Tue Feb 16 09:41:32 CET 2016 - snwint@suse.de
+
+- create also s390x package (bsc#964471)
+
 -------------------------------------------------------------------
 Thu Feb 11 13:43:14 UTC 2016 - rguenther@suse.com
 
diff --git a/syslinux.spec b/syslinux.spec
index 40e2625..9eff31e 100644
--- a/syslinux.spec
+++ b/syslinux.spec
@@ -37,6 +37,7 @@ Release:        0
 Source:         https://www.kernel.org/pub/linux/utils/boot/syslinux/%{name}-%{version}.tar.bz2
 Source1:        isolinux-config
 Source2:        README.gfxboot
+Source3:        baselibs.conf
 Patch0:         %{name}-%{version}-iso9660.diff
 Patch1:         %{name}-%{version}-cwd.diff
 Patch2:         %{name}-%{version}-noinitrd.diff
@@ -54,6 +55,7 @@ Patch14:        %{name}-%{version}-timeout.diff
 Patch15:        %{name}-%{version}-cache_fix.diff
 Patch16:        %{name}-%{version}-mtime.diff
 Patch17:        %{name}-%{version}-miniacc.diff
+Patch18:        %{name}-%{version}-align.diff
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 
 %description
@@ -87,6 +89,7 @@ Authors:
 %patch15 -p1
 %patch16 -p1
 %patch17
+%patch18
 
 %build
 cp %{SOURCE2} .