diff --git a/community-mod/stable/autoconf/depends b/community-mod/stable/autoconf/depends
index 8fd1a89..72b0f6e 100644
--- a/community-mod/stable/autoconf/depends
+++ b/community-mod/stable/autoconf/depends
@@ -1,2 +1,2 @@
-m4
+qm4-git
 perl
diff --git a/core-mod/core/m4/build b/community-mod/stable/gnu-m4/build
similarity index 100%
rename from core-mod/core/m4/build
rename to community-mod/stable/gnu-m4/build
diff --git a/core-mod/core/m4/checksums b/community-mod/stable/gnu-m4/checksums
similarity index 100%
rename from core-mod/core/m4/checksums
rename to community-mod/stable/gnu-m4/checksums
diff --git a/core-mod/core/m4/sources b/community-mod/stable/gnu-m4/sources
similarity index 100%
rename from core-mod/core/m4/sources
rename to community-mod/stable/gnu-m4/sources
diff --git a/core-mod/core/m4/version b/community-mod/stable/gnu-m4/version
similarity index 100%
rename from core-mod/core/m4/version
rename to community-mod/stable/gnu-m4/version
diff --git a/community-mod/stable/libgmp/depends b/community-mod/stable/libgmp/depends
index e8fb4a1..e15a376 100644
--- a/community-mod/stable/libgmp/depends
+++ b/community-mod/stable/libgmp/depends
@@ -1 +1 @@
-m4 make
+qm4-git make
diff --git a/community-mod/stable/libtool/depends b/community-mod/stable/libtool/depends
index 8fd1a89..72b0f6e 100644
--- a/community-mod/stable/libtool/depends
+++ b/community-mod/stable/libtool/depends
@@ -1,2 +1,2 @@
-m4
+qm4-git
 perl
diff --git a/core-mod/core/bison/depends b/core-mod/core/bison/depends
index 995fb87..8748d9e 100644
--- a/core-mod/core/bison/depends
+++ b/core-mod/core/bison/depends
@@ -1 +1 @@
-m4
+qm4-git
diff --git a/core-mod/core/flex/depends b/core-mod/core/flex/depends
index e8fb4a1..e15a376 100644
--- a/core-mod/core/flex/depends
+++ b/core-mod/core/flex/depends
@@ -1 +1 @@
-m4 make
+qm4-git make
diff --git a/core-mod/core/qm4-git/build b/core-mod/core/qm4-git/build
new file mode 100755
index 0000000..308f47c
--- /dev/null
+++ b/core-mod/core/qm4-git/build
@@ -0,0 +1,9 @@
+#!/bin/sh -e
+
+make
+make PREFIX="$1/usr" install
+
+# register for alternatives system
+mv "$1/usr/bin/qm4" "$1/usr/bin/m4"
+mv "$1/usr/share/man/man1/qm4.1" "$1/usr/share/man/man1/m4.1"
+
diff --git a/core-mod/core/qm4-git/sources b/core-mod/core/qm4-git/sources
new file mode 100644
index 0000000..c5594c6
--- /dev/null
+++ b/core-mod/core/qm4-git/sources
@@ -0,0 +1 @@
+git+https://github.com/ctarbide/qm4
diff --git a/core-mod/core/qm4-git/version b/core-mod/core/qm4-git/version
new file mode 100644
index 0000000..a383ea1
--- /dev/null
+++ b/core-mod/core/qm4-git/version
@@ -0,0 +1 @@
+git 1
diff --git a/core-mod/extra/mesa/depends b/core-mod/extra/mesa/depends
index 31e7db1..fc6287f 100644
--- a/core-mod/extra/mesa/depends
+++ b/core-mod/extra/mesa/depends
@@ -13,7 +13,7 @@ libxcb
 libxshmfence
 linux-headers make
 llvm
-m4            make
+qm4-git            make
 meson         make
 pkgconf       make
 python        make
diff --git a/core-mod/xorg/xcb-util-cursor/depends b/core-mod/xorg/xcb-util-cursor/depends
index cc7a52f..20c62ea 100644
--- a/core-mod/xorg/xcb-util-cursor/depends
+++ b/core-mod/xorg/xcb-util-cursor/depends
@@ -1,6 +1,6 @@
 libXau
 libxcb
-m4      make
+qm4-git      make
 pkgconf make
 xcb-util
 xcb-util-image
diff --git a/core-mod/xorg/xcb-util-wm/depends b/core-mod/xorg/xcb-util-wm/depends
index 0074522..7032b8a 100644
--- a/core-mod/xorg/xcb-util-wm/depends
+++ b/core-mod/xorg/xcb-util-wm/depends
@@ -1,4 +1,4 @@
 libxcb
-m4       make
+qm4-git       make
 pkgconf  make
 xcb-util make
diff --git a/testing/autoconf-2.13/depends b/testing/autoconf-2.13/depends
index 8fd1a89..72b0f6e 100644
--- a/testing/autoconf-2.13/depends
+++ b/testing/autoconf-2.13/depends
@@ -1,2 +1,2 @@
-m4
+qm4-git
 perl
diff --git a/testing/webbrowser/depends b/testing/webbrowser/depends
index 7caa6db..edfdaca 100644
--- a/testing/webbrowser/depends
+++ b/testing/webbrowser/depends
@@ -9,7 +9,7 @@ libXt
 libevent
 libffi
 libvpx
-m4 make
+qm4-git make
 perl make
 python2 make
 sqlite