diff --git a/cf-cli.changes b/cf-cli.changes
index 61c5694..6655493 100644
--- a/cf-cli.changes
+++ b/cf-cli.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Tue Mar 21 15:23:14 UTC 2017 - thardeck@suse.com
+
+- clean up spec file
+
 -------------------------------------------------------------------
 Tue Mar 21 14:23:27 UTC 2017 - thardeck@suse.com
 
diff --git a/cf-cli.spec b/cf-cli.spec
index de98a60..bc04115 100644
--- a/cf-cli.spec
+++ b/cf-cli.spec
@@ -39,22 +39,21 @@ This is the official command line client for Cloud Foundry.
 %setup -q -n cli-%{version}
 
 %build
-cd %{_builddir}/cli-%{version}
+cp %{SOURCE1} ./
 # show correct version instead of 0.0.0
 grep -rl "0.0.0-unknown-version" ./ | xargs sed -i 's/0.0.0-unknown-version/%{version}/g'
 %goprep %{import_path}
 %gobuild
 
 %install
+%goinstall
 install -m 755 -d %{buildroot}/%{_sysconfdir}/bash_completion.d
 cp ci/installers/completion/cf %{buildroot}/%{_sysconfdir}/bash_completion.d/cf
-mkdir -p %{buildroot}/usr/bin
-cp ../go/bin/cli %{buildroot}/usr/bin/cf
-cp %{SOURCE1} ./
+mv %{buildroot}/%{_bindir}/cli  %{buildroot}/%{_bindir}/cf
 
 %files
-/usr/bin/cf
 %defattr(-,root,root,-)
+%{_bindir}/cf
 %config %{_sysconfdir}/bash_completion.d/cf
 %doc CHANGELOG.md LICENSE NOTICE README