diff --git a/xorg-cf-files.changes b/xorg-cf-files.changes
index d294c3f..d6b6072 100644
--- a/xorg-cf-files.changes
+++ b/xorg-cf-files.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Thu Sep 27 19:07:30 UTC 2018 - sndirsch@suse.com
+
+- no longer use $RPM_OPT_FLAGS in order to make it a real noarch
+  package (boo#1110020)
+
 -------------------------------------------------------------------
 Tue Feb 27 13:11:08 UTC 2018 - schwab@suse.de
 
diff --git a/xorg-cf-files.spec b/xorg-cf-files.spec
index ea915d2..cb72218 100644
--- a/xorg-cf-files.spec
+++ b/xorg-cf-files.spec
@@ -66,39 +66,39 @@ cat > host.def << EOF
 %endif
 #ifdef  i386Architecture
 #undef  DefaultGcc2i386Opt
-#define DefaultGcc2i386Opt      $RPM_OPT_FLAGS -fno-strict-aliasing
+#define DefaultGcc2i386Opt      -O2 -Wall -fno-strict-aliasing
 #endif
 #ifdef  MipsArchitecture
 #undef  DefaultGcc2MipsOpt
-#define DefaultGcc2MipsOpt      $RPM_OPT_FLAGS -fno-strict-aliasing
+#define DefaultGcc2MipsOpt      -O2 -Wall -fno-strict-aliasing
 #endif
 #ifdef  PpcArchitecture
 #undef  DefaultGcc2PpcOpt
-#define DefaultGcc2PpcOpt       $RPM_OPT_FLAGS -fno-strict-aliasing
+#define DefaultGcc2PpcOpt       -O2 -Wall -fno-strict-aliasing
 #endif
 #ifdef  Ppc64Architecture
 #undef  DefaultGcc2Ppc64Opt
-#define DefaultGcc2Ppc64Opt     $RPM_OPT_FLAGS -fno-strict-aliasing
+#define DefaultGcc2Ppc64Opt     -O2 -Wall -fno-strict-aliasing
 #endif
 #ifdef  AMD64Architecture
 #undef  DefaultGcc2AMD64Opt
-#define DefaultGcc2AMD64Opt     $RPM_OPT_FLAGS -fno-strict-aliasing
+#define DefaultGcc2AMD64Opt     -O2 -Wall -fno-strict-aliasing
 #endif
 #ifdef  AArch64Architecture
 #undef  DefaultGcc2AArch64Opt
-#define DefaultGcc2AArch64Opt   $RPM_OPT_FLAGS -fno-strict-aliasing
+#define DefaultGcc2AArch64Opt   -O2 -Wall -fno-strict-aliasing
 #endif
 #ifdef  s390xArchitecture
 #undef  OptimizedCDebugFlags
-#define OptimizedCDebugFlags    $RPM_OPT_FLAGS -fno-strict-aliasing
+#define OptimizedCDebugFlags    -O2 -Wall -fno-strict-aliasing
 #endif
 #ifdef  ia64Architecture
 #undef  OptimizedCDebugFlags
-#define OptimizedCDebugFlags    $RPM_OPT_FLAGS -fno-strict-aliasing
+#define OptimizedCDebugFlags    -O2 -Wall -fno-strict-aliasing
 #endif
 #if defined(SparcArchitecture) || defined(Sparc64Architecture)
 #undef  OptimizedCDebugFlags
-#define OptimizedCDebugFlags    $RPM_OPT_FLAGS -fno-strict-aliasing
+#define OptimizedCDebugFlags    -O2 -Wall -fno-strict-aliasing
 # undef HaveLib64
 #if defined(Sparc64Architecture)
 # define HaveLib64    YES