diff --git a/iproute2-doc.changes b/iproute2-doc.changes
index b2fd601..6901a2f 100644
--- a/iproute2-doc.changes
+++ b/iproute2-doc.changes
@@ -1,21 +1,27 @@
+-------------------------------------------------------------------
+Sat Jun 10 14:29:22 UTC 2017 - meissner@suse.com
+
+- split link and compile steps for binaries, so LDFLAGS and CFLAGS
+  are not mixed so the the PIE default build work.
+
 -------------------------------------------------------------------
 Tue Dec 13 14:05:49 UTC 2016 - jengelh@inai.de
 
 - Update to new upstream release 4.9
-* bridge: vlan: add support to display per-vlan statistics
-* tipc: add the ability to get UDP bearer options
-* tc: flower: Introduce vlan support
-* ss: output TCP BBR diag information
-* iptnl: add support for collect_md flag in IPv4 and IPv6 tunnels
-* ss: Support displaying and filtering on socket marks.
-* tc: fq: display unthrottle latency
-* ip link: Add support to configure SR-IOV VF to vlan protocol 802.1ad (VST QinQ)
-* ip rule: add selector support
-* bridge: add support for the multicast flood flag
-* ip: update link types to show 6lowpan and ieee802.15.4 monitor
-* ss: Add support for SCTP protocol
-* iproute2: macvlan: add "source" mode
-
+  * bridge: vlan: add support to display per-vlan statistics
+  * tipc: add the ability to get UDP bearer options
+  * tc: flower: Introduce vlan support
+  * ss: output TCP BBR diag information
+  * iptnl: add support for collect_md flag in IPv4 and IPv6 tunnels
+  * ss: Support displaying and filtering on socket marks.
+  * tc: fq: display unthrottle latency
+  * ip link: Add support to configure SR-IOV VF to vlan protocol
+    802.1ad (VST QinQ)
+  * ip rule: add selector support
+  * bridge: add support for the multicast flood flag
+  * ip: update link types to show 6lowpan and ieee802.15.4 monitor
+  * ss: Add support for SCTP protocol
+  * iproute2: macvlan: add "source" mode
 
 -------------------------------------------------------------------
 Wed Nov 16 08:29:11 UTC 2016 - jslaby@suse.com
diff --git a/iproute2-doc.spec b/iproute2-doc.spec
index e7eb62a..5195bd5 100644
--- a/iproute2-doc.spec
+++ b/iproute2-doc.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package iproute2-doc
 #
-# 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/iproute2-split-make.patch b/iproute2-split-make.patch
new file mode 100644
index 0000000..4310205
--- /dev/null
+++ b/iproute2-split-make.patch
@@ -0,0 +1,37 @@
+Index: iproute2-4.9.0/misc/Makefile
+===================================================================
+--- iproute2-4.9.0.orig/misc/Makefile
++++ iproute2-4.9.0/misc/Makefile
+@@ -17,23 +17,24 @@ endif
+ ifeq ($(IP_CONFIG_SETNS),y)
+ 	CFLAGS += -DHAVE_SETNS
+ endif
++CFLAGS += -I$(DBM_INCLUDE) 
+ 
+ all: $(TARGETS)
+ 
+ ss: $(SSOBJ)
+ 	$(QUIET_LINK)$(CC) $^ $(LDFLAGS) $(LDLIBS) -o $@
+ 
+-nstat: nstat.c
+-	$(QUIET_CC)$(CC) $(CFLAGS) $(LDFLAGS) -o nstat nstat.c $(LIBNETLINK) -lm
++nstat: nstat.o
++	$(QUIET_CC)$(CC) $(LDFLAGS) -o nstat nstat.o $(LIBNETLINK) -lm
+ 
+-ifstat: ifstat.c
+-	$(QUIET_CC)$(CC) $(CFLAGS) $(LDFLAGS) -o ifstat ifstat.c $(LIBNETLINK) -lm
++ifstat: ifstat.o
++	$(QUIET_CC)$(CC) $(LDFLAGS) -o ifstat ifstat.o $(LIBNETLINK) -lm
+ 
+-rtacct: rtacct.c
+-	$(QUIET_CC)$(CC) $(CFLAGS) $(LDFLAGS) -o rtacct rtacct.c $(LIBNETLINK) -lm
++rtacct: rtacct.o
++	$(QUIET_CC)$(CC) $(LDFLAGS) -o rtacct rtacct.o $(LIBNETLINK) -lm
+ 
+-arpd: arpd.c
+-	$(QUIET_CC)$(CC) $(CFLAGS) -I$(DBM_INCLUDE) $(LDFLAGS) -o arpd arpd.c $(LIBNETLINK) -ldb -lpthread
++arpd: arpd.o
++	$(QUIET_CC)$(CC) $(LDFLAGS) -o arpd arpd.o $(LIBNETLINK) -ldb -lpthread
+ 
+ ssfilter.c: ssfilter.y
+ 	$(QUIET_YACC)bison ssfilter.y -o ssfilter.c
diff --git a/iproute2.changes b/iproute2.changes
index b165766..6901a2f 100644
--- a/iproute2.changes
+++ b/iproute2.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Sat Jun 10 14:29:22 UTC 2017 - meissner@suse.com
+
+- split link and compile steps for binaries, so LDFLAGS and CFLAGS
+  are not mixed so the the PIE default build work.
+
 -------------------------------------------------------------------
 Tue Dec 13 14:05:49 UTC 2016 - jengelh@inai.de
 
diff --git a/iproute2.spec b/iproute2.spec
index a708924..6ba99dd 100644
--- a/iproute2.spec
+++ b/iproute2.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package iproute2
 #
-# 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
@@ -38,6 +38,7 @@ Patch3:         revert-pdf-creation.diff
 Patch4:         revert-bison-fix.diff
 Patch5:         kernel_xfrm6_raw.patch
 Patch6:         man-fix-documentation-references-in-manual-pages.patch
+Patch7:         iproute2-split-make.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 BuildRequires:  bison
 BuildRequires:  db-devel
@@ -89,7 +90,7 @@ bash command line completion support for iproute.
 %if 0%{?sles_version} == 11
 %patch -P 4 -p1
 %endif
-%patch -P 5 -P 6 -p1
+%patch -P 5 -P 6 -P 7 -p1
 find . -name *.orig -delete
 
 %build