diff --git a/systemd-mini.spec b/systemd-mini.spec
index c7d5d60..6b7fa07 100644
--- a/systemd-mini.spec
+++ b/systemd-mini.spec
@@ -575,7 +575,7 @@ Requires(postun): systemd
 systemd-journal-gatewayd serves journal events over the network using HTTP.
 
 %prep
-%setup -q
+%setup -q -n systemd-%version
 echo "Checking whether upstream rpm macros changed..."
 diff -au "%{S:10}" src/core/macros.systemd.in
 
diff --git a/systemd.spec b/systemd.spec
index 69dcd32..61a2f1c 100644
--- a/systemd.spec
+++ b/systemd.spec
@@ -570,7 +570,7 @@ Requires(postun): systemd
 systemd-journal-gatewayd serves journal events over the network using HTTP.
 
 %prep
-%setup -q
+%setup -q -n systemd-%version
 echo "Checking whether upstream rpm macros changed..."
 diff -au "%{S:10}" src/core/macros.systemd.in