diff --git a/asterisk-18.4.0-astmm_ignore_for_console_board.patch b/asterisk-18.4.0-astmm_ignore_for_console_board.patch
new file mode 100644
index 0000000..402e159
--- /dev/null
+++ b/asterisk-18.4.0-astmm_ignore_for_console_board.patch
@@ -0,0 +1,10 @@
+--- a/channels/console_board.c	2022-04-07 16:00:48.018413156 +0200
++++ b/channels/console_board.c	2022-04-07 16:00:38.836359567 +0200
+@@ -41,6 +41,7 @@
+ 	<support_level>extended</support_level>
+  ***/
+ 
++#define ASTMM_LIBC ASTMM_IGNORE
+ #include "asterisk.h"	/* ast_strdupa */
+ #include "asterisk/utils.h"	/* ast_strdupa */
+ #include "console_video.h"	/* ast_strdupa */
diff --git a/asterisk-18.4.0-res_snmp_fpic.patch b/asterisk-18.4.0-res_snmp_fpic.patch
new file mode 100644
index 0000000..4669bf9
--- /dev/null
+++ b/asterisk-18.4.0-res_snmp_fpic.patch
@@ -0,0 +1,11 @@
+--- a/res/Makefile	2022-04-07 16:31:40.365791898 +0200
++++ b/res/Makefile	2022-04-07 16:31:31.592727512 +0200
+@@ -74,6 +74,8 @@
+ $(call MOD_ADD_C,res_stir_shaken,$(wildcard res_stir_shaken/*.c))
+ 
+ res_parking.o: _ASTCFLAGS+=$(AST_NO_FORMAT_TRUNCATION)
++snmp/agent.o: _ASTCFLAGS+=-fPIC
++res_snmp.o: _ASTCFLAGS+=-fPIC
+ 
+ # Dependencies for res_ari_*.so are generated, so they're in this file
+ include ari.make
diff --git a/asterisk.spec b/asterisk.spec
index 7791a25..c7e1921 100644
--- a/asterisk.spec
+++ b/asterisk.spec
@@ -51,7 +51,7 @@
 Summary:          The Open Source PBX
 Name:             asterisk
 Version:          18.4.0
-Release:          %{?_rc||?_beta:0.}1%{?_rc:.rc%{_rc}}%{?_beta:.beta%{_beta}}%{?dist}.5
+Release:          %{?_rc||?_beta:0.}1%{?_rc:.rc%{_rc}}%{?_beta:.beta%{_beta}}%{?dist}.6
 License:          GPLv2
 URL:              http://www.asterisk.org/
 
@@ -90,6 +90,9 @@ Patch0:           asterisk-mariadb.patch
 Patch1:           asterisk-16.1.0-explicit-python3.patch
 %endif
 
+Patch2:           asterisk-18.4.0-astmm_ignore_for_console_board.patch
+Patch3:           asterisk-18.4.0-res_snmp_fpic.patch
+
 # Asterisk now builds against a bundled copy of pjproject, as they apply some patches
 # directly to pjproject before the build against it
 Provides:         bundled(pjproject) = %{pjsip_version}
@@ -650,6 +653,9 @@ echo '*************************************************************************'
 %patch1 -p1
 %endif
 
+%patch2 -p1
+%patch3 -p1
+
 cp %{S:3} menuselect.makedeps
 cp %{S:4} menuselect.makeopts
 
@@ -1663,6 +1669,9 @@ fi
 %endif
 
 %changelog
+* Wed Jun 15 2022 Michal Josef Špaček <mspacek@redhat.com> - 18.4.0-1.6
+- Fix build (#1977579)
+
 * Wed Jun 01 2022 Jitka Plesnikova <jplesnik@redhat.com> - 18.4.0-1.5
 - Perl 5.36 rebuild