diff --git a/.gitignore b/.gitignore
index 840a65d0..3a43f609 100644
--- a/.gitignore
+++ b/.gitignore
@@ -32,3 +32,4 @@ bin/
 _output/
 tools/
 contrib/registry/data
+contrib/rpm/*.tar.gz
diff --git a/contrib/rpm/matchbox.spec b/contrib/rpm/matchbox.spec
index ff847b1f..eb1dcb5d 100644
--- a/contrib/rpm/matchbox.spec
+++ b/contrib/rpm/matchbox.spec
@@ -8,7 +8,8 @@ Release:	2%{?dist}
 Summary:	Network boot and provision CoreOS machines
 License:	ASL 2.0
 URL:		https://%{import_path}
-Source0:	https://%{import_path}/archive/v%{version}.tar.gz
+Source0:        https://%{import_path}/archive/v%{version}/%{name}-%{version}.tar.gz
+
 
 BuildRequires: golang
 BuildRequires: systemd
@@ -28,9 +29,7 @@ ExclusiveArch: %{go_arches}
 BuildRequires: compiler(golang)
 
 %prep
-%setup
-# tarball has <repo>-<version> top level dir, not <name>-<version>
-#%setup -q -n %{repo}-%{version}
+%setup -q -n %{repo}-%{version}
 
 %build
 # create a Go workspace with a symlink to builddir source