diff --git a/coccinelle.changes b/coccinelle.changes
index 30e3012..861493e 100644
--- a/coccinelle.changes
+++ b/coccinelle.changes
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Mon Jul 29 09:43:52 UTC 2019 - Dominique Leuenberger <dimstar@opensuse.org>
+
+- Drop pre-shipped binaries for spgen and spgen.opt: since these
+  are x86_64 binaries, they would not be usable on i586 builds of
+  coccinella.
+
 -------------------------------------------------------------------
 Wed Jan 24 11:30:59 UTC 2018 - jengelh@inai.de
 
diff --git a/coccinelle.spec b/coccinelle.spec
index 6e734d7..f8bcd95 100644
--- a/coccinelle.spec
+++ b/coccinelle.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package coccinelle
 #
-# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2019 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
@@ -12,7 +12,7 @@
 # license that conforms to the Open Source Definition (Version 1.9)
 # published by the Open Source Initiative.
 
-# Please submit bugfixes or comments via http://bugs.opensuse.org/
+# Please submit bugfixes or comments via https://bugs.opensuse.org/
 #
 
 
@@ -20,14 +20,12 @@ Name:           coccinelle
 Version:        1.0.6
 Release:        0
 Summary:        Semantic patch utility
-License:        GPL-2.0
+License:        GPL-2.0-only
 Group:          Productivity/Text/Utilities
-Url:            http://coccinelle.lip6.fr/
-
+URL:            http://coccinelle.lip6.fr/
 #Git-Clone:	git://github.com/coccinelle/coccinelle
-Source:         http://coccinelle.lip6.fr/distrib/%name-%version.tgz
+Source:         http://coccinelle.lip6.fr/distrib/%{name}-%{version}.tgz
 Patch1:         kill-env.diff
-BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 BuildRequires:  autoconf
 BuildRequires:  automake
 BuildRequires:  fdupes
@@ -39,7 +37,7 @@ BuildRequires:  ocaml-ocamlbuild
 BuildRequires:  ocaml-ocamldoc >= 3.11
 BuildRequires:  ocaml-parmap-devel
 BuildRequires:  ocaml-pcre-devel
-BuildRequires:  pkg-config
+BuildRequires:  pkgconfig
 BuildRequires:  ocamlfind(camlp4)
 BuildRequires:  pkgconfig(python)
 Requires:       python-base
@@ -60,7 +58,8 @@ fixing bugs in systems code.
 
 %prep
 %setup -q
-%patch -P 1 -p1
+%patch1 -p1
+rm tools/spgen/source/spgen{,.opt}
 
 %build
 autoreconf -fi
@@ -72,24 +71,24 @@ make %{?_smp_mflags}
 # with the -custom option."
 export NO_BRP_STRIP_DEBUG=true
 export NO_DEBUGINFO_STRIP_DEBUG=true
-%define __debug_install_post %nil
+%define __debug_install_post %{nil}
 : >debugfiles.list
 : >debugsources.list
 : >debugsourcefiles.list
 
 %make_install
 # Remove coccilib, don't have the deps
-rm -Rf "%buildroot/%_libdir/%name"/{commons,globals,ocaml,parsing_c} \
-	"%buildroot/%_mandir/man3"/Coccilib*
-%fdupes %buildroot/%_prefix
+rm -Rf "%{buildroot}/%{_libdir}/%{name}"/{commons,globals,ocaml,parsing_c} \
+	"%{buildroot}/%{_mandir}/man3"/Coccilib*
+%fdupes %{buildroot}/%{_prefix}
 
 %files
-%defattr(-,root,root)
 %doc authors.txt bugs.txt changes.txt copyright.txt credits.txt
-%doc license.txt readme.txt
-%_mandir/man?/*
-%_bindir/sp*
-%_bindir/pycocci
-%_libdir/%name
+%license license.txt
+%doc readme.txt
+%{_mandir}/man?/*
+%{_bindir}/sp*
+%{_bindir}/pycocci
+%{_libdir}/%{name}
 
 %changelog