diff --git a/NEWS b/NEWS
index fb06874ac41..4667b5ef074 100644
--- a/NEWS
+++ b/NEWS
@@ -5,6 +5,7 @@ PHP                                                                        NEWS
 - Core:
   . Fixed bug GH-15408 (MSan false-positve on zend_max_execution_timer).
     (zeriyoshi)
+  . Fixed bug GH-15515 (Configure error grep illegal option q). (Peter Kokot)
 
 - MySQLnd:
   . Fixed bug GH-15432 (Heap corruption when querying a vector). (cmb,
diff --git a/configure.ac b/configure.ac
index a84faac3a8d..fc796be4da0 100644
--- a/configure.ac
+++ b/configure.ac
@@ -264,7 +264,7 @@ esac
 
 dnl Detect musl libc
 AC_MSG_CHECKING([whether we are using musl libc])
-if command -v ldd >/dev/null && ldd --version 2>&1 | grep -q ^musl
+if command -v ldd >/dev/null && ldd --version 2>&1 | grep ^musl >/dev/null 2>&1
 then
   AC_MSG_RESULT(yes)
   AC_DEFINE([__MUSL__], [1], [Define when using musl libc])
diff --git a/ext/posix/config.m4 b/ext/posix/config.m4
index ff4a421542d..ef64d67174d 100644
--- a/ext/posix/config.m4
+++ b/ext/posix/config.m4
@@ -14,7 +14,8 @@ if test "$PHP_POSIX" = "yes"; then
 
 dnl Skip pathconf and fpathconf check on musl libc due to limited implementation
 dnl (first argument is not validated and has different error).
-  AS_IF([command -v ldd >/dev/null && ldd --version 2>&1 | grep -q "^musl"],[],
+  AS_IF([command -v ldd >/dev/null && ldd --version 2>&1 | grep ^musl >/dev/null 2>&1],
+    [],
     [AC_CHECK_FUNCS(pathconf fpathconf)])
 
   AC_MSG_CHECKING([for working ttyname_r() implementation])