diff --git a/initviocons.changes b/initviocons.changes
index 663835e..3101d28 100644
--- a/initviocons.changes
+++ b/initviocons.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Wed May 31 21:41:00 UTC 2017 - meissner@suse.com
+
+- Actually build with RPM_OPT_FLAGS, will also catch
+  too long -F arguments (bsc#1041840)
+
 -------------------------------------------------------------------
 Fri Feb 17 18:56:46 UTC 2012 - rschweikert@suse.com
 
diff --git a/initviocons.spec b/initviocons.spec
index ef67001..8d44a4c 100644
--- a/initviocons.spec
+++ b/initviocons.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package initviocons
 #
-# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -47,13 +47,11 @@ Authors:
 %setup -n initviocons-%{version}
 
 %build
-export CFLAGS="$RPM_OPT_FLAGS -Wall"
 autoreconf -fi
 %configure
-make
+make CFLAGS="$RPM_OPT_FLAGS -Wall"
 
 %install
-[ "$RPM_BUILD_ROOT" != "/" ] && [ -d $RPM_BUILD_ROOT ] && rm -rf $RPM_BUILD_ROOT;
 %make_install
 install -m 0755 termprobes $RPM_BUILD_ROOT/%{_bindir}/termprobes
 #UsrMerge