diff --git a/math/cln/Makefile b/math/cln/Makefile
index ac72051600cf..d328552a1334 100644
--- a/math/cln/Makefile
+++ b/math/cln/Makefile
@@ -26,8 +26,7 @@ INFO=		cln
 
 .if ${ARCH} == aarch64 || ${ARCH} == armv6 || ${ARCH} == armv7
 CPPFLAGS+=	-DNO_ASM
-EXTRA_PATCHES+=	${PATCHDIR}/extra-patch-src_base_cl__low.h \
-		${PATCHDIR}/extra-patch-src_base_low_cl__low__div.cc \
+EXTRA_PATCHES+=	${PATCHDIR}/extra-patch-src_base_low_cl__low__div.cc \
 		${PATCHDIR}/extra-patch-src_base_low_cl__low__mul.cc
 .endif
 
diff --git a/math/cln/files/extra-patch-src_base_cl__low.h b/math/cln/files/extra-patch-src_base_cl__low.h
deleted file mode 100644
index 7177af422b36..000000000000
--- a/math/cln/files/extra-patch-src_base_cl__low.h
+++ /dev/null
@@ -1,29 +0,0 @@
---- src/base/cl_low.h.orig	2015-01-28 09:25:18 UTC
-+++ src/base/cl_low.h
-@@ -207,7 +207,7 @@ inline uint32 mulu32_unchecked (uint32 a
-   // declared inside a namespace!
- } extern "C" uint32 mulu32_high; namespace cln {        // -> High-Teil
- #else
--  extern "C" uint32 mulu32_high;                        // -> High-Teil
-+}  extern "C" uint32 mulu32_high; namespace cln {       // -> High-Teil
- #endif
- #if defined(__GNUC__) && defined(__m68k__) && !defined(NO_ASM)
-   #define mulu32(x,y,hi_zuweisung,lo_zuweisung)  \
-@@ -439,7 +439,7 @@ inline uint32 mulu32_unchecked (uint32 a
-   // Workaround MSVC compiler bug.
- } extern "C" uint16 divu_16_rest; namespace cln {         // -> Rest r
- #else
--  extern "C" uint16 divu_16_rest;                         // -> Rest r
-+}  extern "C" uint16 divu_16_rest; namespace cln {        // -> Rest r
- #endif
- #endif
- #if defined(__GNUC__) && defined(__sparc64__) && !defined(NO_ASM)
-@@ -589,7 +589,7 @@ inline uint32 mulu32_unchecked (uint32 a
-   // Workaround MSVC compiler bug.
- } extern "C" uint32 divu_32_rest; namespace cln {         // -> Rest r
- #else
--  extern "C" uint32 divu_32_rest;                         // -> Rest r
-+}  extern "C" uint32 divu_32_rest; namespace cln {        // -> Rest r
- #endif
- #if defined(__GNUC__) && defined(__sparc64__) && !defined(NO_ASM)
-   #define divu_3232_3232(x,y,q_zuweisung,r_zuweisung)  \
diff --git a/math/cln/files/extra-patch-src_base_low_cl__low__div.cc b/math/cln/files/extra-patch-src_base_low_cl__low__div.cc
index fa6c2c78daf9..15124551e323 100644
--- a/math/cln/files/extra-patch-src_base_low_cl__low__div.cc
+++ b/math/cln/files/extra-patch-src_base_low_cl__low__div.cc
@@ -1,11 +1,11 @@
---- src/base/low/cl_low_div.cc.orig	2018-06-23 21:13:46 UTC
+--- src/base/low/cl_low_div.cc.orig	2011-04-08 21:07:28 UTC
 +++ src/base/low/cl_low_div.cc
 @@ -207,7 +207,7 @@ uint32 divu_6432_3232_(uint32 xhi, uint32 xlo, uint32 
  #endif
  
  #ifdef NEED_VAR_divu_64_rest
 -uint64 divu_64_rest;
-+extern "C" uint64 divu_64_rest;
++extern "C" uint64 divu_64_rest = 0;
  #endif
  
  #ifdef NEED_FUNCTION_divu_6464_6464_
diff --git a/math/cln/files/extra-patch-src_base_low_cl__low__mul.cc b/math/cln/files/extra-patch-src_base_low_cl__low__mul.cc
index ecdb7c70891c..8e8c48c4de2e 100644
--- a/math/cln/files/extra-patch-src_base_low_cl__low__mul.cc
+++ b/math/cln/files/extra-patch-src_base_low_cl__low__mul.cc
@@ -1,4 +1,4 @@
---- src/base/low/cl_low_mul.cc.orig	2018-06-23 21:15:19 UTC
+--- src/base/low/cl_low_mul.cc.orig	2011-04-08 21:06:30 UTC
 +++ src/base/low/cl_low_mul.cc
 @@ -50,11 +50,11 @@ uint64 mulu32_w (uint32 arg1, uint32 arg2)
  
@@ -10,7 +10,7 @@
  
  #ifdef NEED_FUNCTION_mulu64_
 -uint64 mulu64_high;
-+extern "C" uint64 mulu64_high;
++extern "C" uint64 mulu64_high = 0;
  namespace cln {
  extern "C" uint64 mulu64_ (uint64 x, uint64 y);
  uint64 mulu64_ (uint64 x, uint64 y)