diff --git a/cpio.changes b/cpio.changes
index dda2ceb..c3e3868 100644
--- a/cpio.changes
+++ b/cpio.changes
@@ -1,3 +1,11 @@
+-------------------------------------------------------------------
+Sun Mar 29 20:54:38 UTC 2020 - Kristyna Streitova <kstreitova@suse.com>
+
+- starting with GCC 10, the default of '-fcommon' option will
+  change to '-fno-common'. Because cpio build fails with
+  'fno-common', add '-fcommon' option to optflags as a temporary
+  workaround for this problem till it's properly fixed [bsc#1160870] 
+
 -------------------------------------------------------------------
 Mon Nov  4 15:53:41 UTC 2019 - Kristyna Streitova <kstreitova@suse.com>
 
diff --git a/cpio.spec b/cpio.spec
index e2c00f5..f67b993 100644
--- a/cpio.spec
+++ b/cpio.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package cpio
 #
-# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2020 SUSE LLC
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -92,7 +92,7 @@ This package includes the 'mt', a local tape drive control program.
 %build
 gettextize -f --no-changelog
 autoreconf -fiv
-export CFLAGS="%{optflags} -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE"
+export CFLAGS="%{optflags} -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -fcommon"
 %configure \
   --with-rmt="%{_bindir}/rmt" \
   --enable-mt \