diff --git a/cf-cli.changes b/cf-cli.changes
index 177ed60..872e9cb 100644
--- a/cf-cli.changes
+++ b/cf-cli.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Mon Dec 11 12:38:34 UTC 2017 - thardeck@suse.com
+
+- remove obsolete go-bindata statement (fixes segmentation fault)
+- add simple check to verify that cf does not segfault
+
 -------------------------------------------------------------------
 Tue Nov 21 09:04:56 UTC 2017 - thardeck@suse.com
 
diff --git a/cf-cli.spec b/cf-cli.spec
index 3501b9c..d68ccf7 100644
--- a/cf-cli.spec
+++ b/cf-cli.spec
@@ -34,7 +34,6 @@ Source1:        README
 BuildRequires:  go >= 1.8.3
 BuildRequires:  golang-packaging
 BuildRequires:  xz
-BuildRequires:  golang-github-jteeuwen-go-bindata
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 
 %{go_nostrip}
@@ -51,10 +50,13 @@ cp %{SOURCE1} ./
 %build
 # 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'
-go-bindata -nometadata  -pkg resources -ignore ".go" -o i18n/resources/i18n_resources.go i18n/resources/*.all.json
 %goprep %{import_path}
 %gobuild
 
+%check
+echo 'Test if cf can be executed'
+../go/bin/cli --version
+
 %install
 cp ../go/bin/cli %{buildroot}/%{_bindir}/cf
 install -m 755 -d %{buildroot}/%{_sysconfdir}/bash_completion.d