diff --git a/patch-cyrus-32bit-reconstruct b/patch-cyrus-32bit-reconstruct
new file mode 100644
index 0000000..d7497ab
--- /dev/null
+++ b/patch-cyrus-32bit-reconstruct
@@ -0,0 +1,22 @@
+diff --git a/imap/mailbox.c b/imap/mailbox.c
+index e7498c0..8b6f406 100644
+--- a/imap/mailbox.c
++++ b/imap/mailbox.c
+@@ -5425,7 +5425,7 @@ static int find_files(struct mailbox *mailbox, struct found_uids *files,
+     }
+ 
+     /* make sure UIDs are sorted for comparison */
+-    qsort(files->found, files->nused, sizeof(unsigned long), sort_found);
++    qsort(files->found, files->nused, sizeof(files->found[0]), sort_found);
+ 
+     strarray_fini(&paths);
+ 
+@@ -6206,7 +6206,7 @@ static int find_annots(struct mailbox *mailbox, struct found_uids *annots)
+     if (r) return r;
+ 
+     /* make sure UIDs are sorted for comparison */
+-    qsort(annots->found, annots->nused, sizeof(unsigned long), sort_found);
++    qsort(annots->found, annots->nused, sizeof(annots->found[0]), sort_found);
+ 
+     return 0;
+ }