diff --git a/config/configure.in.in b/config/configure.in.in
index c67fd35f..fe232ef3 100644
--- a/config/configure.in.in
+++ b/config/configure.in.in
@@ -30,6 +30,9 @@ config CONFIGURE_has_make_3_81_or_newer
 config CONFIGURE_has_make_4_0_or_newer
     @KCONFIG_make_4_0_or_newer@
 
+config CONFIGURE_has_make_4_4_or_newer
+    @KCONFIG_make_4_4_or_newer@
+
 config CONFIGURE_has_libtool_2_4_or_newer
     @KCONFIG_libtool_2_4_or_newer@
 
diff --git a/config/libc/glibc.in b/config/libc/glibc.in
index c5de44ce..81261cdc 100644
--- a/config/libc/glibc.in
+++ b/config/libc/glibc.in
@@ -64,6 +64,15 @@ config GLIBC_DEP_MAKE_4_0
     select COMP_TOOLS_MAKE
     select MAKE_GNUMAKE_SYMLINK # Override old host make in .build/tools/bin
 
+# Glibc versions older than 2.31 have a bug that triggers with GNU make 4.4 or newer
+# where the build process hangs indefinitely
+config GLIBC_DEP_MAKE_4_3
+    def_bool y
+    depends on GLIBC_older_than_2_32 && CONFIGURE_has_make_4_4_or_newer
+    select COMP_TOOLS_MAKE
+    select MAKE_GNUMAKE_SYMLINK
+    select MAKE_REQUIRE_older_than_4_4
+
 # Glibc 2.31 removed support for pre-v8 SPARC in 32-bit mode (64-bit mode always
 # required UltraSPARC)
 config GLIBC_SPARC_ALLOW_V7
diff --git a/configure.ac b/configure.ac
index 9469d217..ffd768a4 100644
--- a/configure.ac
+++ b/configure.ac
@@ -210,6 +210,13 @@ CTNG_PROG_VERSION_REQ_ANY([MAKE],
     [^GNU Make [4-9]\.],
     [make_4_0_or_newer])
 
+CTNG_PROG_VERSION_REQ_ANY([MAKE],
+    [GNU make >= 4.4],
+    [make],
+    [gmake make],
+    [^GNU Make (4\.[4-9]|[5-9]\.)],
+    [make_4_4_or_newer])
+
 # Check other companion tools that we may or may not build.
 CTNG_PROG_VERSION_REQ_ANY([LIBTOOL],
     [GNU libtool >= 2.4],
diff --git a/packages/make/4.3/version.desc b/packages/make/4.3/version.desc
index fcfe3891..e497b2f5 100644
--- a/packages/make/4.3/version.desc
+++ b/packages/make/4.3/version.desc
@@ -1 +1 @@
-obsolete='yes'
+# Not obsolete. Needed for a workaround for older glibc versions
diff --git a/packages/make/package.desc b/packages/make/package.desc
index bd789ade..657a674a 100644
--- a/packages/make/package.desc
+++ b/packages/make/package.desc
@@ -2,5 +2,6 @@ repository='git https://git.savannah.gnu.org/git/make.git'
 bootstrap='autoreconf -i'
 mirrors='$(CT_Mirrors GNU make)'
 relevantpattern='*.*|.'
+milestones='4.3 4.4'
 archive_formats='.tar.lz .tar.gz'
 signature_format='packed/.sig'