diff --git a/_constraints b/_constraints
index 7cdbe04..a80a788 100644
--- a/_constraints
+++ b/_constraints
@@ -6,7 +6,7 @@
       <size unit="G">8</size>
     </memory>
     <disk>
-      <size unit="G">60</size>
+      <size unit="G">20</size>
     </disk>
   </hardware>
 <!-- i586, armv6 and armv7 tend to run out of memory during builds -->
@@ -22,9 +22,6 @@
       <physicalmemory>
         <size unit="G">4</size>
       </physicalmemory>
-      <disk>
-        <size unit="G">15</size>
-      </disk>
     </hardware>
   </overwrite>
 <!-- x86_64 to use physical memory to speed builds up -->
@@ -36,9 +33,6 @@
       <physicalmemory>
         <size unit="G">8</size>
       </physicalmemory>
-      <disk>
-        <size unit="G">50</size>
-      </disk>
     </hardware>
   </overwrite>
 <!-- aarch64 is a time consuming build, try to use RAM -->
@@ -50,22 +44,6 @@
       <physicalmemory>
         <size unit="G">8</size>
       </physicalmemory>
-      <disk>
-        <size unit="G">10</size>
-      </disk>
-    </hardware>
-  </overwrite>
-<!-- 25GB of disk as 60GB is unavailable (and unrequired) on s390x and ppc64 -->
-  <overwrite>
-    <conditions>
-      <arch>s390x</arch>
-      <arch>ppc64</arch>
-      <arch>ppc64le</arch>
-    </conditions>
-    <hardware>
-      <disk>
-        <size unit="G">25</size>
-      </disk>
     </hardware>
   </overwrite>
 </constraints>
diff --git a/rust.changes b/rust.changes
index 6b58b08..ead5160 100644
--- a/rust.changes
+++ b/rust.changes
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Fri Jan 17 11:04:12 UTC 2020 - Dominique Leuenberger <dimstar@opensuse.org>
+
+- Adjust constraints: Request 20GB HDD for all archs. Simplify the
+  file by removing the overrides for various disk sizes. All archs
+  are curretnly at roughly 17GB storage in use.
+
 -------------------------------------------------------------------
 Wed Jan  8 16:44:17 UTC 2020 - Federico Mena Quintero <federico@suse.com>
 
diff --git a/rust.spec b/rust.spec
index e2cc8c3..c7ba682 100644
--- a/rust.spec
+++ b/rust.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package rust
 #
-# Copyright (c) 2020 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2020 SUSE LLC
 # Copyright (c) 2019 Luke Jones, luke@ljones.dev
 #
 # All modifications and additions to the file contributed by third parties
@@ -13,7 +13,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/
 #
 
 
@@ -120,7 +120,7 @@ Release:        0
 Summary:        A systems programming language
 License:        MIT OR Apache-2.0
 Group:          Development/Languages/Rust
-Url:            https://www.rust-lang.org
+URL:            https://www.rust-lang.org
 Source0:        %{dl_url}/rustc-%{version}-src.tar.xz
 Source99:       %{name}-rpmlintrc
 Source100:      %{dl_url}/rust-%{version_bootstrap}-x86_64-unknown-linux-gnu.tar.xz