diff --git a/auto-config-update-aarch64-ppc64le.diff b/auto-config-update-aarch64-ppc64le.diff
index f7ab7f5..ee68fc3 100644
--- a/auto-config-update-aarch64-ppc64le.diff
+++ b/auto-config-update-aarch64-ppc64le.diff
@@ -2,7 +2,7 @@ Index: build/parseBuildInstallClean.c
 ===================================================================
 --- build/parseBuildInstallClean.c.orig
 +++ build/parseBuildInstallClean.c
-@@ -46,7 +46,23 @@ int parseBuildInstallClean(rpmSpec spec,
+@@ -46,7 +46,22 @@ int parseBuildInstallClean(rpmSpec spec,
      } else if (rc < 0) {
  	goto exit;
      }
@@ -16,7 +16,6 @@ Index: build/parseBuildInstallClean.c
 +            "         grep -q config-patches@ $c || continue\n"
 +            "         grep -q aarch64 $c || install -m 755 $ref/config.$s $c\n"
 +            "         grep -q ppc64le $c || install -m 755 $ref/config.$s $c\n"
-+            "         grep -q 'riscv64[-:]' $c || install -m 755 $ref/config.$s $c\n"
 +            "     done\n"
 +            "done\n"
 +        );
diff --git a/auto-config-update-riscv64.diff b/auto-config-update-riscv64.diff
new file mode 100644
index 0000000..38f9940
--- /dev/null
+++ b/auto-config-update-riscv64.diff
@@ -0,0 +1,10 @@
+--- ./build/parseBuildInstallClean.c.orig	2018-02-22 10:11:50.088160024 +0000
++++ ./build/parseBuildInstallClean.c	2018-02-22 10:11:37.592198130 +0000
+@@ -55,6 +55,7 @@ int parseBuildInstallClean(rpmSpec spec,
+             "         grep -q config-patches@ $c || continue\n"
+             "         grep -q aarch64 $c || install -m 755 $ref/config.$s $c\n"
+             "         grep -q ppc64le $c || install -m 755 $ref/config.$s $c\n"
++            "         grep -q 'riscv64[-:]' $c || install -m 755 $ref/config.$s $c\n"
+             "     done\n"
+             "done\n"
+         );
diff --git a/rpm.changes b/rpm.changes
index 6bb725f..d54aec8 100644
--- a/rpm.changes
+++ b/rpm.changes
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Thu Feb 22 11:14:38 CET 2018 - mls@suse.de
+
+- split riscv64 part from auto-config-update-aarch64-ppc64le.diff
+  to make the change rust-proof.
+  new patch: auto-config-update-riscv64.diff
+
 -------------------------------------------------------------------
 Thu Feb 15 11:11:21 UTC 2018 - schwab@suse.de
 
diff --git a/rpm.spec b/rpm.spec
index a3dbe5d..eb4f96a 100644
--- a/rpm.spec
+++ b/rpm.spec
@@ -132,6 +132,7 @@ Patch109:       pythondistdeps.diff
 Patch111:       debugedit-bnc1076819.diff
 Patch112:       hardlinks.diff
 Patch6464:      auto-config-update-aarch64-ppc64le.diff
+Patch6465:      auto-config-update-riscv64.diff
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 #
 # avoid bootstrapping problem
@@ -232,6 +233,9 @@ rm -f rpmdb/db.h
 %ifarch aarch64 ppc64le riscv64
 %patch6464
 %endif
+%ifarch riscv64
+%patch6465
+%endif
 
 cp config.guess config.sub db/dist/
 cp config.guess config.sub beecrypt/