diff --git a/xrdb.changes b/xrdb.changes
index 55263fd..b252743 100644
--- a/xrdb.changes
+++ b/xrdb.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Thu Jan 10 13:21:14 UTC 2019 - sndirsch@suse.com
+
+- run cpp with "-x assembler-with-cpp" in order to get rid of
+  warnings when parsing valid comments (bsc#1120004)
+
 -------------------------------------------------------------------
 Wed Apr  4 16:31:31 UTC 2018 - sndirsch@suse.com
 
diff --git a/xrdb.spec b/xrdb.spec
index 7b0af76..f6b85aa 100644
--- a/xrdb.spec
+++ b/xrdb.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package xrdb
 #
-# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2019 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
@@ -43,7 +43,9 @@ root window of any or all screens, or everything combined.
 %setup -q
 
 %build
-%configure --with-cpp=%{_bindir}/cpp
+# Run cpp with "-x assembler-with-cpp" in order to get rid of
+# warnings when parsing valid comments (bsc#1120004)
+%configure --with-cpp="%{_bindir}/cpp -x assembler-with-cpp, /lib/cpp"
 make %{?_smp_mflags}
 
 %install