diff --git a/cobbler.spec b/cobbler.spec
index 4d45b92..853fa28 100644
--- a/cobbler.spec
+++ b/cobbler.spec
@@ -1,5 +1,3 @@
-%global debug_package %{nil}
-
 %global tftp_dir /var/lib/tftpboot/
 
 %global commit0 f78af86a963b099d1e22586b24aedff9062da9c1
@@ -12,6 +10,7 @@ Summary:        Boot server configurator
 URL:            https://cobbler.github.io/
 License:        GPLv2+
 Source0:        https://github.com/cobbler/cobbler/archive/v%{version}.tar.gz#/%{name}-%{version}.tar.gz
+BuildArch:      noarch
 
 BuildRequires: git
 BuildRequires: python3-devel
@@ -38,14 +37,11 @@ Requires: python3-simplejson
 Requires: python3-tornado
 Requires: python3-urlgrabber
 
-# syslinux is only available on x86
-%ifarch %{ix86} x86_64
-Requires: syslinux
-%endif
-
 Requires: genisoimage
 %if 0%{?fedora} || 0%{?rhel} > 7
 Requires: dnf-plugins-core
+# syslinux is only available on x86
+Requires: (syslinux if (filesystem.x86_64 or filesystem.i686))
 %else
 Requires: yum-utils
 %endif
@@ -75,7 +71,6 @@ other applications.
 
 %package -n cobbler-web
 Summary:        Web interface for Cobbler
-BuildArch:      noarch
 Requires:       cobbler = %{version}-%{release}
 Requires:       python3-django
 Requires:       python3-mod_wsgi