diff --git a/debugedit-riscv.patch b/debugedit-riscv.patch
new file mode 100644
index 0000000..d75e440
--- /dev/null
+++ b/debugedit-riscv.patch
@@ -0,0 +1,27 @@
+From 86ec4c03de2b7cc6af6ba5b10dd686002e0b588c Mon Sep 17 00:00:00 2001
+From: Andreas Schwab <schwab@suse.de>
+Date: Mon, 26 Feb 2018 10:34:26 +0100
+Subject: [PATCH] debugedit: handle RISC-V relocation
+
+Resolves #407
+---
+ tools/debugedit.c | 6 ++++++
+ 1 file changed, 6 insertions(+)
+
+Index: tools/debugedit.c
+===================================================================
+--- tools/debugedit.c.orig
++++ tools/debugedit.c
+@@ -1985,6 +1985,12 @@ edit_dwarf2 (DSO *dso)
+ 		  if (rtype != R_68K_32)
+ 		    goto fail;
+ 		  break;
++#if defined(EM_RISCV) && defined(R_RISCV_32)
++		case EM_RISCV:
++		  if (rtype != R_RISCV_32)
++		    goto fail;
++		  break;
++#endif
+ 		default:
+ 		fail:
+ 		  error (1, 0, "%s: Unhandled relocation %d in .debug_info section",
diff --git a/python-rpm.spec b/python-rpm.spec
index 2915945..d361560 100644
--- a/python-rpm.spec
+++ b/python-rpm.spec
@@ -22,7 +22,7 @@ Version:        4.14.1
 Release:        0
 #!BuildIgnore:  rpmlint-Factory
 Summary:        Python Bindings for Manipulating RPM Packages
-License:        GPL-2.0+
+License:        GPL-2.0-or-later
 Group:          Development/Libraries/Python
 Source99:       rpm.spec
 BuildRequires:  file-devel
diff --git a/rpm.changes b/rpm.changes
index 8458b2f..99fdc40 100644
--- a/rpm.changes
+++ b/rpm.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Mon Mar  5 09:23:16 UTC 2018 - schwab@suse.de
+
+- debugedit-riscv.patch: handle RISC-V relocation in debugedit
+
 -------------------------------------------------------------------
 Thu Mar  1 16:42:07 CET 2018 - mls@suse.de
 
diff --git a/rpm.spec b/rpm.spec
index 80b67ad..4570940 100644
--- a/rpm.spec
+++ b/rpm.spec
@@ -49,7 +49,7 @@ BuildRequires:  zlib-devel
 Provides:       rpminst
 Requires(post): %fillup_prereq
 Summary:        The RPM Package Manager
-License:        GPL-2.0+
+License:        GPL-2.0-or-later
 Group:          System/Packages
 Version:        4.14.1
 Release:        0
@@ -130,6 +130,7 @@ Patch108:       debugedit-macro.diff
 Patch109:       pythondistdeps.diff
 Patch111:       debugedit-bnc1076819.diff
 Patch112:       hardlinks.diff
+Patch113:       debugedit-riscv.patch
 Patch6464:      auto-config-update-aarch64-ppc64le.diff
 Patch6465:      auto-config-update-riscv64.diff
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
@@ -227,7 +228,7 @@ rm -f rpmdb/db.h
 %patch                               -P 85
 %patch                   -P 93 -P 94                         -P 99
 %patch -P 100        -P 102 -P 103                             -P 108
-%patch -P 109 -P 111 -P 112
+%patch -P 109 -P 111 -P 112 -P 113
 
 %ifarch aarch64 ppc64le riscv64
 %patch6464