diff --git a/cf-cli.changes b/cf-cli.changes
index 25b03cb..2a1a335 100644
--- a/cf-cli.changes
+++ b/cf-cli.changes
@@ -1,7 +1,6 @@
 -------------------------------------------------------------------
 Thu Oct 12 11:49:59 UTC 2017 - thardeck@suse.com
 
-- adapt setup process to new github release tarballs
 - run go-bindata to create the in newer tarballs  missing resource file
   (borrowed from bin/generate-language-resources to work without internet)
 
diff --git a/cf-cli.spec b/cf-cli.spec
index d40f740..efe0c6e 100644
--- a/cf-cli.spec
+++ b/cf-cli.spec
@@ -44,7 +44,8 @@ BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 This is the official command line client for Cloud Foundry.
 
 %prep
-%setup -q -n cli-%{version}
+%setup -q -c -n %{name}-%{version}
+mv */* ./
 cp %{SOURCE1} ./
 
 %build