diff --git a/baselibs.conf b/baselibs.conf
index 978c84d..cee82f7 100644
--- a/baselibs.conf
+++ b/baselibs.conf
@@ -1,6 +1,5 @@
 libmagic1
-    requires "file-magic-<targettype> = <version>"
+    requires "file-magic = <version>"
 file-devel
     requires -file-<targettype>
     requires "libmagic1-<targettype> = <version>"
-file-magic
diff --git a/file.changes b/file.changes
index b2100fa..f8b9fec 100644
--- a/file.changes
+++ b/file.changes
@@ -1,3 +1,21 @@
+-------------------------------------------------------------------
+Wed Aug 24 14:16:09 UTC 2016 - dimstar@opensuse.org
+
+- Fix boo#995089:
+  * Do not attempt to produce a file-magic-32bit package: there is
+    nothing arch-dependant in this package (for completeness, this
+    was already fixed just before by Marcus)
+  * Fix baselibs.conf for libmagic1-32bit to require file-magic
+    instead of file-magic-32bit.
+  * Build file-magic as noarch on openSUSE >= 1200 (where rpm is
+    new enough to support this).
+
+-------------------------------------------------------------------
+Wed Aug 24 14:16:08 UTC 2016 - meissner@suse.com
+
+- file-magic is architecture independend, no need for a baselibs
+  package.
+
 -------------------------------------------------------------------
 Thu Aug 18 12:24:36 UTC 2016 - werner@suse.de
 
diff --git a/file.spec b/file.spec
index 821efa6..36eee69 100644
--- a/file.spec
+++ b/file.spec
@@ -79,6 +79,9 @@ Summary:        The magic files for libmagic to use
 Group:          Productivity/File utilities
 Obsoletes:      libmagic-data < %{version}
 Provides:       libmagic-data = %{version}
+%if 0%{?suse_version} >= 1200
+BuildArch:      noarch
+%endif
 
 %description magic
 This package contains the basic magic files that libmagic reads and uses