diff --git a/installation-images.spec b/installation-images.spec
index b0b8808..d94b952 100644
--- a/installation-images.spec
+++ b/installation-images.spec
@@ -28,6 +28,7 @@ ExclusiveArch:  do_not_build
 %define with_plymouth 1
 %define with_shim 1
 %define with_storage_ng 1
+%define with_libinput 1
 %bcond_without sbl
 %bcond_without vnc
 %bcond_with xen
@@ -115,6 +116,8 @@ BuildRequires:  openSUSE-Tumbleweed-Kubic-release
 %define branding_gfxboot  SLE
 BuildRequires:  sled-release
 %if 0%{?sle_version} != 0150000
+%define with_storage_ng 0
+%define with_libinput 0
 BuildRequires:  sled-release-DVD
 BuildRequires:  sle12-desktop-migration
 %endif
@@ -128,6 +131,8 @@ BuildRequires:  sle12-desktop-migration
 %define branding_gfxboot  SLE
 BuildRequires:  sles-release
 %if 0%{?sle_version} != 0150000
+%define with_storage_ng 0
+%define with_libinput 0
 BuildRequires:  sles-release-DVD
 BuildRequires:  sle12-desktop-migration
 %ifarch x86_64 ppc64le
@@ -144,6 +149,8 @@ BuildRequires:  sap-installation-wizard
 %define branding_gfxboot  SLE
 BuildRequires:  SLES_SAP-installation-release
 %if 0%{?sle_version} != 0150000
+%define with_storage_ng 0
+%define with_libinput 0
 BuildRequires:  sles-release-DVD
 BuildRequires:  sle12-desktop-migration
 BuildRequires:  sap-installation-wizard
@@ -159,6 +166,8 @@ BuildRequires:  sap-installation-wizard
 %define config_bootmenu_no_upgrade 1
 BuildRequires:  caasp-release
 %if 0%{?sle_version} != 0150000
+%define with_storage_ng 0
+%define with_libinput 0
 BuildRequires:  caasp-release-DVD
 %endif
 %endif
@@ -188,9 +197,11 @@ BuildRequires:  grub2-branding-%branding_grub2
 ExcludeArch:    %ix86
 %endif
 
+%if 0%{?with_libinput}
 %ifnarch s390x
 BuildRequires:  xf86-input-libinput
 %endif
+%endif
 BuildRequires:  google-roboto-fonts
 BuildRequires:  noto-sans-fonts
 %ifarch ia64 %ix86 x86_64