diff --git a/crda.changes b/crda.changes
index 84368ad..5099051 100644
--- a/crda.changes
+++ b/crda.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Sat Jun  3 09:30:42 UTC 2017 - meissner@suse.com
+
+- adjust Makefile patch to not include CFLAGS on linker line,
+  this indirectly enables PIE support.
+
 -------------------------------------------------------------------
 Wed May 25 09:27:14 UTC 2016 - martin.liska@suse.com
 
diff --git a/crda.spec b/crda.spec
index d89bd9d..8e94921 100644
--- a/crda.spec
+++ b/crda.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package crda
 #
-# Copyright (c) 2016 SUSE LINUX 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
diff --git a/gcc6-fix-errors.patch b/gcc6-fix-errors.patch
index e2d0424..31d0486 100644
--- a/gcc6-fix-errors.patch
+++ b/gcc6-fix-errors.patch
@@ -1,6 +1,8 @@
---- 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 @@
+Index: crda-3.18/Makefile
+===================================================================
+--- crda-3.18.orig/Makefile
++++ crda-3.18/Makefile
+@@ -26,7 +26,7 @@ PUBKEY_DIR?=pubkeys
  RUNTIME_PUBKEY_DIR?=/etc/wireless-regdb/pubkeys
  
  CFLAGS += -O2 -fpic
@@ -9,3 +11,32 @@
  CFLAGS += -Wall -g
  LDLIBREG += -lreg
  LDLIBS += $(LDLIBREG)
+@@ -135,23 +135,23 @@ install-libreg:
+ 
+ crda: crda.o
+ 	$(NQ) '  LD  ' $@
+-	$(Q)$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $^ $(LDLIBS) $(NLLIBS)
++	$(Q)$(CC) $(LDFLAGS) -o $@ $^ $(LDLIBS) $(NLLIBS)
+ 
+ regdbdump: regdbdump.o
+ 	$(NQ) '  LD  ' $@
+-	$(Q)$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $^ $(LDLIBS)
++	$(Q)$(CC) $(LDFLAGS) -o $@ $^ $(LDLIBS)
+ 
+ intersect: intersect.o
+ 	$(NQ) '  LD  ' $@
+-	$(Q)$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $^ $(LDLIBS)
++	$(Q)$(CC) $(LDFLAGS) -o $@ $^ $(LDLIBS)
+ 
+ db2rd: db2rd.o
+ 	$(NQ) '  LD  ' $@
+-	$(Q)$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $^ $(LDLIBS)
++	$(Q)$(CC) $(LDFLAGS) -o $@ $^ $(LDLIBS)
+ 
+ optimize: optimize.o
+ 	$(NQ) '  LD  ' $@
+-	$(Q)$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $^ $(LDLIBS)
++	$(Q)$(CC) $(LDFLAGS) -o $@ $^ $(LDLIBS)
+ 
+ verify: $(REG_BIN) regdbdump
+ 	$(NQ) '  CHK  $(REG_BIN)'