diff --git a/_service b/_service
index 375238f..d7d213c 100644
--- a/_service
+++ b/_service
@@ -13,6 +13,7 @@
   </service>
   <service mode="buildtime" name="tar">
     <param name="obsinfo">cockpit-machines.obsinfo</param>
+    <param name="filename">cockpit-machines</param>
   </service>
   <service mode="buildtime" name="set_version">
     <param name="basename">cockpit-machines</param>
diff --git a/cockpit-machines.spec b/cockpit-machines.spec
index ac302a2..9a41aba 100644
--- a/cockpit-machines.spec
+++ b/cockpit-machines.spec
@@ -22,7 +22,9 @@ Release:        0
 Summary:        Cockpit user interface for virtual machines
 License:        LGPL-2.1-or-later AND MIT
 URL:            https://github.com/cockpit-project/cockpit-machines
-Source:         cockpit-machines-%{version}.tar
+# source_validator insists that if obscpio has no version then
+# tarball must neither
+Source:         cockpit-machines.tar
 Source10:       package-lock.json
 Source11:       node_modules.spec.inc
 %include %_sourcedir/node_modules.spec.inc
@@ -54,7 +56,7 @@ If "virt-install" is installed, you can also create new virtual machines.
 
 
 %prep
-%autosetup -p1
+%autosetup -p1 -n %{name}
 rm -f package-lock.json
 local-npm-registry %{_sourcedir} install --with=dev --legacy-peer-deps || ( find ~/.npm/_logs -name '*-debug.log' -print0 | xargs -0 cat; false)