diff --git a/main/main.c b/main/main.c
index e33ef29d61bb..6d29d3462b51 100644
--- a/main/main.c
+++ b/main/main.c
@@ -127,8 +127,8 @@ PHPAPI char *php_get_version(sapi_module_struct *sapi_module)
 {
 	smart_string version_info = {0};
 	smart_string_append_printf(&version_info,
-		"PHP %s (%s) (built: %s) (%s)\n",
-		PHP_VERSION, sapi_module->name, php_build_date,
+		"PHP " PHP_VERSION " (%s) (built: %s) (%s)\n",
+		sapi_module->name, php_build_date,
 #ifdef ZTS
 		"ZTS"
 #else
@@ -148,8 +148,12 @@ PHPAPI char *php_get_version(sapi_module_struct *sapi_module)
 #endif
 	);
 	smart_string_appends(&version_info, "Copyright (c) The PHP Group\n");
-	if (php_build_provider()) {
-		smart_string_append_printf(&version_info, "Built by %s\n", php_build_provider());
+
+	const char *build_provider = php_build_provider();
+	if (build_provider) {
+		smart_string_appends(&version_info, "Built by ");
+		smart_string_appends(&version_info, build_provider);
+		smart_string_appendc(&version_info, '\n');
 	}
 	smart_string_appends(&version_info, get_zend_version());
 	smart_string_0(&version_info);
@@ -160,7 +164,7 @@ PHPAPI char *php_get_version(sapi_module_struct *sapi_module)
 PHPAPI void php_print_version(sapi_module_struct *sapi_module)
 {
 	char *version_info = php_get_version(sapi_module);
-	php_printf("%s", version_info);
+	PHPWRITE(version_info, strlen(version_info));
 	efree(version_info);
 }