diff --git a/crda.changes b/crda.changes
index 8ac8ef8..84368ad 100644
--- a/crda.changes
+++ b/crda.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Wed May 25 09:27:14 UTC 2016 - martin.liska@suse.com
+
+- Add gcc6-fix-errors.patch to remove errors seen by GCC6.
+
 -------------------------------------------------------------------
 Sun Jun 28 10:57:08 UTC 2015 - seife+obs@b1-systems.com
 
diff --git a/crda.spec b/crda.spec
index b81447c..d89bd9d 100644
--- a/crda.spec
+++ b/crda.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package crda
 #
-# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2016 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
@@ -37,6 +37,8 @@ BuildRequires:  pkgconfig(libnl-3.0)
 BuildRequires:  pkgconfig(udev)
 Requires:       wireless-regdb
 Supplements:    kernel >= 2.6.29
+# PATCH-FIX-OPENSUSE gcc6-fix-errors.patch -- Fix errors seen by GCC6.
+Patch0:         gcc6-fix-errors.patch
 
 %description
 The crda binary provides access to the wireless-regdb to the kernel
@@ -44,6 +46,7 @@ through udev.
 
 %prep
 %setup -q
+%patch0 -p1
 # make install calls 'ldconfig' and fails if it cannot run it...
 ln -s /bin/true ldconfig
 
diff --git a/gcc6-fix-errors.patch b/gcc6-fix-errors.patch
new file mode 100644
index 0000000..e2d0424
--- /dev/null
+++ b/gcc6-fix-errors.patch
@@ -0,0 +1,11 @@
+--- crda-3.18/Makefile	2016-05-25 11:21:57.462831428 +0200
++++ crda-3.18/Makefile	2014-12-11 00:51:29.000000000 +0100
+@@ -26,7 +26,7 @@
+ RUNTIME_PUBKEY_DIR?=/etc/wireless-regdb/pubkeys
+ 
+ CFLAGS += -O2 -fpic
+-CFLAGS += -std=gnu99 -Wall -Werror -pedantic
++CFLAGS += -std=gnu99 -Wall -Werror -Wno-unused-const-variable -pedantic
+ CFLAGS += -Wall -g
+ LDLIBREG += -lreg
+ LDLIBS += $(LDLIBREG)