diff --git a/cjdns.32bit.patch b/cjdns.32bit.patch
new file mode 100644
index 0000000..6696c84
--- /dev/null
+++ b/cjdns.32bit.patch
@@ -0,0 +1,14 @@
+diff -up ./memory/Allocator.c.32bit ./memory/Allocator.c
+--- ./memory/Allocator.c.32bit	2020-09-29 14:10:32.115169486 -0400
++++ ./memory/Allocator.c	2020-09-29 14:16:54.682448839 -0400
+@@ -59,8 +59,8 @@ static void unroll(struct Allocator_pvt*
+         writeUnroller(&childUnroller);
+         fprintf(stderr, "%s:%ld [%lu] bytes at [0x%lx]\n",
+                 allocation->fileName,
+-                allocation->lineNum,
+-                allocation->pub.size,
++                (long)allocation->lineNum,
++                (unsigned long)allocation->pub.size,
+                 (long)(uintptr_t)allocation);
+         allocation = allocation->next;
+     }
diff --git a/cjdns.spec b/cjdns.spec
index 52ae0fe..63ea086 100644
--- a/cjdns.spec
+++ b/cjdns.spec
@@ -124,8 +124,6 @@ Patch5:  cjdns.sbin.patch
 Patch6:  cjdns.dyn.patch
 # Patch to use _LINUX_CAPABILITY_3 (cjdns < 18)
 #Patch7:  cjdns.cap3.patch
-# Patch some source files to ignore selected warnings that break gcc6 builds
-#Patch8:  cjdns.warnings.patch
 # Man pages
 Patch9:  cjdns.man.patch
 # Patch some bugs in nodejs tools
@@ -154,6 +152,8 @@ Patch18: cjdns.libuv.patch
 Patch20: cjdns.sysctl.patch
 # gcc-10 no longer allows duplicate globals
 Patch22: cjdns.gcc10.patch
+# Patches for 32-bit builds
+Patch23: cjdns.32bit.patch
 
 %if %{use_marked}
 BuildRequires:  nodejs, nodejs-marked, python3
@@ -317,10 +317,6 @@ sed -i -e'/^#include / s,[<>],",g' crypto*int*.h
 cd -
 %endif
 
-%if !0%{?rhel} || 0%{?rhel} > 6
-#patch8 -b .warnings
-%endif
-
 %patch9 -b .man
 %patch10 -b .tools
 #patch13 -b .ppc64
@@ -341,6 +337,7 @@ sed -i -e '/optimizeLevel:/ s/-O0/-O3/' node_build/make.js
 #patch19 -p1 -b .fuzz
 #patch20 -p1 -b .sysctl
 #patch22 -b .gcc10
+%patch23 -b .32bit
 
 cp %{SOURCE1} README_Fedora.md