diff --git a/debian/changelog b/debian/changelog
index 31e2b50dd..7c32da138 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -8,6 +8,7 @@ linux (4.19.12-2) UNRELEASED; urgency=medium
   [ Ben Hutchings ]
   * linux-image-*-unsigned: Remove Provides field (Closes: #916927)
   * [ia64,m68k] libbpf: Don't build on architectures without performance events
+  * [riscv64] tools/include/.../bitsperlong.h: Add support for riscv
 
  -- Uwe Kleine-König <ukleinek@debian.org>  Sun, 23 Dec 2018 17:28:52 +0100
 
diff --git a/debian/patches/bugfix/riscv/tools-include-bitsperlong.h-add-support-for-riscv.patch b/debian/patches/bugfix/riscv/tools-include-bitsperlong.h-add-support-for-riscv.patch
new file mode 100644
index 000000000..f1e23e481
--- /dev/null
+++ b/debian/patches/bugfix/riscv/tools-include-bitsperlong.h-add-support-for-riscv.patch
@@ -0,0 +1,21 @@
+From: Ben Hutchings <ben@decadent.org.uk>
+Date: Tue, 25 Dec 2018 22:38:13 +0000
+Subject: tools/include/.../bitsperlong.h: Add support for riscv
+
+tools/include/uapi/asm/bitsperlong.h needs to include the right
+architecture's <asm/bitsperlong.h> for any architecture that may be
+64-bit.
+
+Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
+---
+--- a/tools/include/uapi/asm/bitsperlong.h
++++ b/tools/include/uapi/asm/bitsperlong.h
+@@ -13,6 +13,8 @@
+ #include "../../arch/mips/include/uapi/asm/bitsperlong.h"
+ #elif defined(__ia64__)
+ #include "../../arch/ia64/include/uapi/asm/bitsperlong.h"
++#elif defined(__riscv)
++#include "../../arch/riscv/include/uapi/asm/bitsperlong.h"
+ #else
+ #include <asm-generic/bitsperlong.h>
+ #endif
diff --git a/debian/patches/series b/debian/patches/series
index 6fbb42978..d23b7f365 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -159,6 +159,7 @@ bugfix/x86/tools-x86_energy_perf_policy-fix-uninitialized-varia.patch
 bugfix/x86/tools-turbostat-Add-checks-for-failure-of-fgets-and-.patch
 bugfix/all/libbpf-add-soname-to-shared-object.patch
 bugfix/all/libbpf-link-shared-object-with-libelf.patch
+bugfix/riscv/tools-include-bitsperlong.h-add-support-for-riscv.patch
 
 # wireless: Disable regulatory.db direct loading (until we sort out signing)
 debian/wireless-disable-regulatory.db-direct-loading.patch