diff --git a/devel/universal-ctags/files/patch-Tmain_map-removing.d_run.sh b/devel/universal-ctags/files/patch-Tmain_map-removing.d_run.sh
new file mode 100644
index 000000000000..114bc757307f
--- /dev/null
+++ b/devel/universal-ctags/files/patch-Tmain_map-removing.d_run.sh
@@ -0,0 +1,32 @@
+--- Tmain/map-removing.d/run.sh.orig	2021-04-18 04:45:23 UTC
++++ Tmain/map-removing.d/run.sh
+@@ -6,25 +6,25 @@ CTAGS=$1
+ echo default map including '*.m'
+ echo =======================================
+ ${CTAGS} --quiet --options=NONE \
+-	 --list-maps | grep '\*\.m\>.*$'
++	 --list-maps | grep '\*\.m\>'
+ echo
+ 
+ echo '[--map-<LANG>]' removing from '*.m' from 'ObjectiveC'
+ echo =======================================
+ ${CTAGS} --quiet --options=NONE \
+-	 --map-ObjectiveC=-.m --list-maps | grep '\*\.m\>.*$'
++	 --map-ObjectiveC=-.m --list-maps | grep '\*\.m\>'
+ echo
+ 
+ echo '[--map-<LANG>]' adding '*.m' to 'Ada'
+ echo =======================================
+ ${CTAGS} --quiet --options=NONE \
+-	 --map-Ada=+.m --list-maps | grep '\*\.m\>.*$'
++	 --map-Ada=+.m --list-maps | grep '\*\.m\>'
+ echo
+ 
+ echo '[--map-<LANG>]' removing from '*.m' from 'ObjectiveC', and adding '*.m' to 'Ada'
+ echo =======================================
+ ${CTAGS} --quiet --options=NONE \
+-	 --map-ObjectiveC=-.m --map-Ada=+.m --list-maps | grep '\*\.m\>.*$'
++	 --map-ObjectiveC=-.m --map-Ada=+.m --list-maps | grep '\*\.m\>'
+ echo
+ 
+ echo '[--map-<LANG>]' guessing parser with adding '*.m' to 'Ada'
diff --git a/devel/universal-ctags/files/patch-misc_packcc_src_packcc.c b/devel/universal-ctags/files/patch-misc_packcc_src_packcc.c
new file mode 100644
index 000000000000..5bc12de4c8f2
--- /dev/null
+++ b/devel/universal-ctags/files/patch-misc_packcc_src_packcc.c
@@ -0,0 +1,11 @@
+--- misc/packcc/src/packcc.c.orig	2021-04-16 22:31:22 UTC
++++ misc/packcc/src/packcc.c
+@@ -910,7 +910,7 @@ static size_t populate_bits(size_t x) {
+     x |= x >>  4;
+     x |= x >>  8;
+     x |= x >> 16;
+-#ifndef _M_IX86 /* not Windows for x86 (32-bit) */
++#if (defined __SIZEOF_SIZE_T__ && __SIZEOF_SIZE_T__ == 8)
+     x |= x >> 32;
+ #endif
+     return x;