diff --git a/_constraints b/_constraints
index 1380d70..2b787e9 100644
--- a/_constraints
+++ b/_constraints
@@ -1,4 +1,12 @@
 <constraints>
+  <hardware>
+    <physicalmemory>
+      <size unit="M">4000</size>
+    </physicalmemory>
+    <disk>
+      <size unit="G">25</size>
+    </disk>
+  </hardware>
 
   <overwrite>
     <conditions>
@@ -14,19 +22,4 @@
     </hardware>
   </overwrite>
 
-  <overwrite>
-    <conditions>
-      <arch>i586</arch>
-      <arch>x86_64</arch>
-      <arch>ppc64</arch>
-    </conditions>
-    <hardware>
-      <physicalmemory>
-        <size unit="M">4000</size>
-      </physicalmemory>
-      <disk>
-        <size unit="G">25</size>
-      </disk>
-    </hardware>
-  </overwrite>
 </constraints>
diff --git a/libreoffice.changes b/libreoffice.changes
index e94bbd0..1f30fd8 100644
--- a/libreoffice.changes
+++ b/libreoffice.changes
@@ -1,3 +1,11 @@
+-------------------------------------------------------------------
+Wed Aug 10 11:21:14 UTC 2016 - dimstar@opensuse.org
+
+- Update _constraints file: set the 25GB HDD / 4GB RAM limit as
+  general requirement (global) which only aarch64 overrides at the
+  moment. Prior, there was no 'default' limit set and all archs
+  were exceptions.
+
 -------------------------------------------------------------------
 Mon Aug  1 08:41:48 UTC 2016 - tchvatal@suse.com