diff --git a/afl.changes b/afl.changes
index e6ac97c..8f9eb6d 100644
--- a/afl.changes
+++ b/afl.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Thu Aug 30 15:03:49 UTC 2018 - Guillaume GARDET <guillaume.gardet@opensuse.org>
+
+- Fix build on non X86* platforms
+
 -------------------------------------------------------------------
 Sun Nov  5 07:57:53 UTC 2017 - mardnh@gmx.de
 
diff --git a/afl.spec b/afl.spec
index ed81e0a..0f03bf5 100644
--- a/afl.spec
+++ b/afl.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package afl
 #
-# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -27,7 +27,6 @@ Source:         http://lcamtuf.coredump.cx/afl/releases/%{name}-%{version}.tgz
 Source1:        afl-rpmlintrc
 Patch1:         afl-1.58b-fix-paths.patch
 BuildRequires:  gcc-c++
-ExclusiveArch:  i586 x86_64
 
 %description
 American fuzzy lop is a security-oriented fuzzer that employs a novel type
@@ -51,9 +50,15 @@ sed -i 's|#!/usr/bin/env bash|#!/bin/bash|g' afl-cmin
 
 %build
 export CFLAGS="$CFLAGS %{optflags}"
+%ifnarch %{ix86} x86_64
+export AFL_NO_X86=1
+%endif
 make %{?_smp_mflags} PREFIX=%{_prefix} LIBEXEC_DIR=%{_libexecdir} DOC_DIR=%{_docdir}
 
 %install
+%ifnarch %{ix86} x86_64
+export AFL_NO_X86=1
+%endif
 make %{?_smp_mflags} PREFIX=%{_prefix} LIBEXEC_DIR=%{_libexecdir} DOC_DIR=%{_docdir} DESTDIR=%{buildroot} install
 
 %files