diff --git a/xtables-addons.changes b/xtables-addons.changes
index be4a7e0..74e5c51 100644
--- a/xtables-addons.changes
+++ b/xtables-addons.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Tue Jun 19 12:13:06 UTC 2018 - msuchanek@suse.com
+
+- Use %{?linux_make_arch} when building kernel modules (boo#1098050).
+
 -------------------------------------------------------------------
 Mon Feb 12 14:18:55 UTC 2018 - jengelh@inai.de
 
diff --git a/xtables-addons.spec b/xtables-addons.spec
index ab05701..9f43b47 100644
--- a/xtables-addons.spec
+++ b/xtables-addons.spec
@@ -20,7 +20,7 @@ Name:           xtables-addons
 Version:        3.0
 Release:        0
 Summary:        IP Packet Filter Administration Extensions
-License:        GPL-2.0 and GPL-2.0+
+License:        GPL-2.0-only AND GPL-2.0-or-later
 Group:          Productivity/Networking/Security
 Url:            http://xtables-addons.sf.net/
 
@@ -72,7 +72,7 @@ for flavor in %flavors_to_build; do
 	cp -a "%name-%version" "%name-$flavor-%version"
 	pushd "%name-$flavor-%version/"
 	%configure --with-kbuild="/usr/src/linux-obj/%_target_cpu/$flavor"
-	make %{?_smp_mflags} V=1
+	make %{?linux_make_arch} %{?_smp_mflags} V=1
 	popd
 done
 
@@ -81,7 +81,7 @@ b="%buildroot"
 pushd ../
 for flavor in %flavors_to_build; do
 	pushd "%name-$flavor-%version/"
-	make install DESTDIR="$b"
+	make %{?linux_make_arch} install DESTDIR="$b"
 	popd
 done
 # There is no -devel package. So no need for these files.