diff --git a/.gear/rules b/.gear/rules
index e95a9e09e..88adfe831 100644
--- a/.gear/rules
+++ b/.gear/rules
@@ -1,2 +1,2 @@
-tar: upstream name=@name@
-tar: vendor
+tar: upstream name=@name@-@version@
+tar: vendor name=@name@-development-@version@ base=vendor
diff --git a/zerotier-one.spec b/zerotier-one.spec
index be15dd6fc..f135aae6b 100644
--- a/zerotier-one.spec
+++ b/zerotier-one.spec
@@ -10,10 +10,10 @@ Group: Networking/Other
 Url: https://www.zerotier.com
 
 # Source-url: # upstream submodule packaged with ./*.sh
-Source0: %name.tar
+Source: %name-%version.tar
 
 # Cargo modules for build rust code in the zeroidc dir
-Source1: vendor.tar
+Source1: %name-development-%version.tar
 
 ExcludeArch: armh
 
@@ -40,12 +40,7 @@ like conventional VPNs or VLANs. It can run on native systems, VMs, or
 containers (Docker, OpenVZ, etc.).
 
 %prep
-mkdir -p zerotier-one
-tar -xf %SOURCE0 -C zerotier-one
-
-cd zerotier-one
-
-tar -xf %SOURCE1 -C .
+%setup -a1
 
 mkdir -p zeroidc/.cargo
 ###
@@ -75,14 +70,12 @@ EOF
 #==
 
 %build
-cd zerotier-one
 %make_build ZT_USE_MINIUPNPC=1 %{?_smp_mflags} one
 
 %pre
 %_bindir/getent passwd zerotier-one || %_sbindir/useradd -r -d /var/lib/zerotier-one -s /sbin/nologin zerotier-one
 
 %install
-cd zerotier-one
 %makeinstall_std
 mkdir -p %buildroot%_unitdir/
 cp debian/zerotier-one.service %buildroot%_unitdir/%name.service