diff --git a/ext/standard/info.c b/ext/standard/info.c
index c9ddbcb4794..69a9d2791c2 100644
--- a/ext/standard/info.c
+++ b/ext/standard/info.c
@@ -100,7 +100,8 @@ PHPAPI void php_print_info(int flag)
 #endif
 		php_printf("php.ini path:  %s<br>\n", CONFIGURATION_FILE_PATH);
 		php_printf("ZEND_DEBUG=%d<br>\n", ZEND_DEBUG);
-		/*php_printf("SAPI=" PHP_SAPI "<br>\n");*/
+		if (sapi_module.name)
+			php_printf("SAPI=%s<br>\n", sapi_module.name);
 #ifdef ZTS
 		php_printf("ZTS is defined");
 #else
diff --git a/sapi/aolserver/aolserver.c b/sapi/aolserver/aolserver.c
index 0575799b8d2..2814e9e046f 100644
--- a/sapi/aolserver/aolserver.c
+++ b/sapi/aolserver/aolserver.c
@@ -291,7 +291,7 @@ php_ns_startup(sapi_module_struct *sapi_module)
 /* this structure is static (as in "it does not change") */
 
 static sapi_module_struct sapi_module = {
-	"PHP Language",
+	"AOLserver",
 
 	php_ns_startup,							/* startup */
 	php_module_shutdown_wrapper,			/* shutdown */
diff --git a/sapi/apache/mod_php4.c b/sapi/apache/mod_php4.c
index 39ec0014282..1d54931e5e8 100644
--- a/sapi/apache/mod_php4.c
+++ b/sapi/apache/mod_php4.c
@@ -212,7 +212,7 @@ int sapi_apache_send_headers(sapi_headers_struct *sapi_headers SLS_DC)
 
 
 sapi_module_struct sapi_module = {
-	"PHP Language",					/* name */
+	"Apache",						/* name */
 									
 	php_module_startup,				/* startup */
 	php_module_shutdown_wrapper,	/* shutdown */
diff --git a/sapi/cgi/cgi_main.c b/sapi/cgi/cgi_main.c
index f117a4f99ba..99ba4858b7b 100644
--- a/sapi/cgi/cgi_main.c
+++ b/sapi/cgi/cgi_main.c
@@ -121,7 +121,7 @@ static char *sapi_cgi_read_cookies(SLS_D)
 
 
 static sapi_module_struct sapi_module = {
-	"PHP Language",					/* name */
+	"CGI",							/* name */
 									
 	php_module_startup,				/* startup */
 	php_module_shutdown_wrapper,	/* shutdown */
diff --git a/sapi/isapi/php4isapi.c b/sapi/isapi/php4isapi.c
index 1fbb41382e8..83416f3ffbf 100644
--- a/sapi/isapi/php4isapi.c
+++ b/sapi/isapi/php4isapi.c
@@ -291,7 +291,7 @@ static char *sapi_isapi_read_cookies(SLS_D)
 
 
 static sapi_module_struct sapi_module = {
-	"PHP Language",					/* name */
+	"ISAPI",						/* name */
 									
 	php_isapi_startup,				/* startup */
 	php_module_shutdown_wrapper,	/* shutdown */
diff --git a/sapi/roxen/roxen.c b/sapi/roxen/roxen.c
index 1ec54f31381..2903d14dde2 100644
--- a/sapi/roxen/roxen.c
+++ b/sapi/roxen/roxen.c
@@ -505,7 +505,7 @@ static int php_roxen_startup(sapi_module_struct *sapi_module)
 void pike_module_exit(void);
 
 static sapi_module_struct sapi_module = {
-  "PHP Language",
+  "Roxen",
 
   php_module_startup,						/* startup */
   pike_module_exit,			/* shutdown */
diff --git a/sapi/servlet/servlet.c b/sapi/servlet/servlet.c
index 4b7ac7b307e..5c7e03e7958 100644
--- a/sapi/servlet/servlet.c
+++ b/sapi/servlet/servlet.c
@@ -210,7 +210,7 @@ static char *sapi_servlet_read_cookies(SLS_D)
  */
 
 static sapi_module_struct sapi_module = {
-	"PHP Language",					/* name */
+	"Java Servlet",					/* name */
 									
 	php_module_startup,				/* startup */
 	php_module_shutdown_wrapper,	/* shutdown */
diff --git a/sapi/thttpd/thttpd.c b/sapi/thttpd/thttpd.c
index c3ac2c5e7fd..b62fa2a965b 100644
--- a/sapi/thttpd/thttpd.c
+++ b/sapi/thttpd/thttpd.c
@@ -102,7 +102,7 @@ static char *sapi_thttpd_read_cookies(SLS_D)
 }
 
 static sapi_module_struct sapi_module = {
-	"PHP Language",
+	"thttpd",
 	
 	php_module_startup,
 	php_module_shutdown_wrapper,