diff --git a/acconfig.h.in b/acconfig.h.in
index fba8562865f..1a85f3acbff 100644
--- a/acconfig.h.in
+++ b/acconfig.h.in
@@ -122,4 +122,8 @@
 /* Define if struct sockaddr contains the field sa_len */
 #undef HAVE_SOCKADDR_SA_LEN
 
-#define sprintf zend_sprintf
+#undef BROKEN_SPRINTF
+
+#if BROKEN_SPRINTF
+#define sprintf php_sprintf
+#endif
diff --git a/configure.in b/configure.in
index 22ffe72b3c1..e1b051e4d9c 100644
--- a/configure.in
+++ b/configure.in
@@ -373,11 +373,7 @@ vsnprintf \
 AC_REPLACE_FUNCS(strlcat strlcpy getopt)
 AC_FUNC_UTIME_NULL
 AC_FUNC_ALLOCA
-dnl## OLDLIBS=$LIBS; LIBS=""
-dnl This is also defined/used in libzend. To avoid a redefinition
-dnl we use that version
-dnl AC_BROKEN_SPRINTF
-dnl## LIBS=$OLDLIBS
+AC_BROKEN_SPRINTF
 
 dnl AIX keeps in_addr_t in /usr/include/netinet/in.h
 dnl AC_MSG_CHECKING(for in_addr_t)