diff --git a/debian/changelog b/debian/changelog
index a9965c4c..207d0971 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -17,6 +17,7 @@ llvm-toolchain-snapshot (1:13~++20210403031832+89afec348dbd-1~exp1) UNRELEASED;
   * Add upstream patch D98519 to add support for Motorola literal syntax to AsmParser
   * Add upstream patch D98537 to implement AsmParser on m68k
   * Add upstream patch D98540 to implement Disassembler on m68k
+  * Add upstream patch D99869 to fix public function visibility on m68k
 
  -- Sylvestre Ledru <sylvestre@debian.org>  Sat, 03 Apr 2021 15:22:07 +0200
 
diff --git a/debian/patches/D99869.diff b/debian/patches/D99869.diff
new file mode 100644
index 00000000..40fb241e
--- /dev/null
+++ b/debian/patches/D99869.diff
@@ -0,0 +1,48 @@
+diff --git a/llvm/lib/Target/M68k/M68kAsmPrinter.cpp b/llvm/lib/Target/M68k/M68kAsmPrinter.cpp
+--- a/llvm/lib/Target/M68k/M68kAsmPrinter.cpp
++++ b/llvm/lib/Target/M68k/M68kAsmPrinter.cpp
+@@ -65,6 +65,6 @@
+ 
+ void M68kAsmPrinter::emitEndOfAsmFile(Module &M) {}
+ 
+-extern "C" void LLVMInitializeM68kAsmPrinter() {
++extern "C" LLVM_EXTERNAL_VISIBILITY void LLVMInitializeM68kAsmPrinter() {
+   RegisterAsmPrinter<M68kAsmPrinter> X(getTheM68kTarget());
+ }
+diff --git a/llvm/lib/Target/M68k/M68kTargetMachine.cpp b/llvm/lib/Target/M68k/M68kTargetMachine.cpp
+--- a/llvm/lib/Target/M68k/M68kTargetMachine.cpp
++++ b/llvm/lib/Target/M68k/M68kTargetMachine.cpp
+@@ -28,7 +28,7 @@
+ 
+ #define DEBUG_TYPE "m68k"
+ 
+-extern "C" void LLVMInitializeM68kTarget() {
++extern "C" LLVM_EXTERNAL_VISIBILITY void LLVMInitializeM68kTarget() {
+   RegisterTargetMachine<M68kTargetMachine> X(getTheM68kTarget());
+ }
+ 
+diff --git a/llvm/lib/Target/M68k/MCTargetDesc/M68kMCTargetDesc.cpp b/llvm/lib/Target/M68k/MCTargetDesc/M68kMCTargetDesc.cpp
+--- a/llvm/lib/Target/M68k/MCTargetDesc/M68kMCTargetDesc.cpp
++++ b/llvm/lib/Target/M68k/MCTargetDesc/M68kMCTargetDesc.cpp
+@@ -106,7 +106,7 @@
+   return new M68kInstPrinter(MAI, MII, MRI);
+ }
+ 
+-extern "C" void LLVMInitializeM68kTargetMC() {
++extern "C" LLVM_EXTERNAL_VISIBILITY void LLVMInitializeM68kTargetMC() {
+   Target &T = getTheM68kTarget();
+ 
+   // Register the MC asm info.
+diff --git a/llvm/lib/Target/M68k/TargetInfo/M68kTargetInfo.cpp b/llvm/lib/Target/M68k/TargetInfo/M68kTargetInfo.cpp
+--- a/llvm/lib/Target/M68k/TargetInfo/M68kTargetInfo.cpp
++++ b/llvm/lib/Target/M68k/TargetInfo/M68kTargetInfo.cpp
+@@ -21,7 +21,7 @@
+ }
+ } // namespace llvm
+ 
+-extern "C" void LLVMInitializeM68kTargetInfo() {
++extern "C" LLVM_EXTERNAL_VISIBILITY void LLVMInitializeM68kTargetInfo() {
+   RegisterTarget<Triple::m68k, /*HasJIT=*/true> X(
+       getTheM68kTarget(), "m68k", "Motorola 68000 family", "M68k");
+ }
+
diff --git a/debian/patches/series b/debian/patches/series
index efea1340..9772037c 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -122,6 +122,7 @@ bootstrap-fix-include-next.diff
 D98519.diff
 D98537.diff
 D98540.diff
+D99869.diff
 
 # riscv64
 risc/clang-riscv64-multiarch.diff