diff --git a/binutils-skip-rpaths.patch b/binutils-skip-rpaths.patch
index e7d6290..3ed3367 100644
--- a/binutils-skip-rpaths.patch
+++ b/binutils-skip-rpaths.patch
@@ -1,16 +1,13 @@
 Index: ld/emultempl/elf32.em
 ===================================================================
---- ld/emultempl/elf32.em.orig	2014-10-14 17:18:40.000000000 +0200
-+++ ld/emultempl/elf32.em	2014-10-14 17:20:23.000000000 +0200
-@@ -1357,8 +1357,38 @@ if test x"$LDEMUL_BEFORE_ALLOCATION" !=
+--- ld/emultempl/elf32.em.orig	2017-03-02 09:23:54.000000000 +0100
++++ ld/emultempl/elf32.em	2017-03-30 13:06:06.406399958 +0200
+@@ -1581,8 +1581,35 @@ if test x"$LDEMUL_BEFORE_ALLOCATION" !=
    else
      ELF_INTERPRETER_SET_DEFAULT=
    fi
 +
-+  libpath_nl=
-+  for path in $NATIVE_LIB_DIRS; do
-+    libpath_nl="$libpath_nl\n$path"
-+  done
++  libpath_nl=`echo ${NATIVE_LIB_DIRS// /\\\n}`
  fragment <<EOF
  
 +static int
@@ -41,7 +38,7 @@ Index: ld/emultempl/elf32.em
  /* used by before_allocation and handle_option. */
  static void
  gld${EMULATION_NAME}_append_to_separated_string (char **to, char *op_arg)
-@@ -1405,7 +1435,7 @@ gld${EMULATION_NAME}_append_to_separated
+@@ -1634,7 +1661,7 @@ static struct bfd_link_hash_entry ehdr_s
  static void
  gld${EMULATION_NAME}_before_allocation (void)
  {
@@ -50,7 +47,7 @@ Index: ld/emultempl/elf32.em
    asection *sinterp;
    bfd *abfd;
    struct elf_link_hash_entry *ehdr_start = NULL;
-@@ -1457,7 +1487,65 @@ gld${EMULATION_NAME}_before_allocation (
+@@ -1691,7 +1718,65 @@ gld${EMULATION_NAME}_before_allocation (
       by dynamic linking.  */
    rpath = command_line.rpath;
    if (rpath == NULL)
diff --git a/binutils.changes b/binutils.changes
index a4f65a5..accb556 100644
--- a/binutils.changes
+++ b/binutils.changes
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Thu Mar 30 11:16:18 UTC 2017 - rguenther@suse.com
+
+- Remove empty rpath component removal optimization from
+  binutils-skip-rpaths.patch to workaround CMake rpath handling.
+  [boo#1025282]
+
 -------------------------------------------------------------------
 Fri Mar 17 15:28:26 UTC 2017 - matz@suse.com