diff --git a/ext/uri/config.m4 b/ext/uri/config.m4
index 33d42c4497642..c8a179c96ef27 100644
--- a/ext/uri/config.m4
+++ b/ext/uri/config.m4
@@ -1,6 +1,13 @@
 dnl Configure options
 dnl
 
+PHP_ARG_WITH([external-uriparser],
+  [for external/system liburiparser],
+  [AS_HELP_STRING([--with-external-uriparser],
+    [Use external/system liburiparser])],
+  [no],
+  [no])
+
 PHP_INSTALL_HEADERS([ext/uri], m4_normalize([
   php_uri.h
   php_uri_common.h
@@ -9,20 +16,32 @@ PHP_INSTALL_HEADERS([ext/uri], m4_normalize([
   uri_parser_php_parse_url.h
 ]))
 
+
 AC_DEFINE([URI_ENABLE_ANSI], [1], [Define to 1 for enabling ANSI support of uriparser.])
 AC_DEFINE([URI_NO_UNICODE], [1], [Define to 1 for disabling unicode support of uriparser.])
 
-URIPARSER_DIR="uriparser"
-URIPARSER_SOURCES="$URIPARSER_DIR/src/UriCommon.c $URIPARSER_DIR/src/UriCompare.c $URIPARSER_DIR/src/UriCopy.c \
-$URIPARSER_DIR/src/UriEscape.c $URIPARSER_DIR/src/UriFile.c $URIPARSER_DIR/src/UriIp4.c $URIPARSER_DIR/src/UriIp4Base.c \
-$URIPARSER_DIR/src/UriMemory.c $URIPARSER_DIR/src/UriNormalize.c $URIPARSER_DIR/src/UriNormalizeBase.c \
-$URIPARSER_DIR/src/UriParse.c $URIPARSER_DIR/src/UriParseBase.c $URIPARSER_DIR/src/UriQuery.c \
-$URIPARSER_DIR/src/UriRecompose.c $URIPARSER_DIR/src/UriResolve.c $URIPARSER_DIR/src/UriSetFragment.c \
-$URIPARSER_DIR/src/UriSetHostAuto.c $URIPARSER_DIR/src/UriSetHostCommon.c $URIPARSER_DIR/src/UriSetHostIp4.c \
-$URIPARSER_DIR/src/UriSetHostIp6.c $URIPARSER_DIR/src/UriSetHostIpFuture.c $URIPARSER_DIR/src/UriSetHostRegName.c \
-$URIPARSER_DIR/src/UriSetPath.c $URIPARSER_DIR/src/UriSetPort.c $URIPARSER_DIR/src/UriSetQuery.c \
-$URIPARSER_DIR/src/UriSetScheme.c $URIPARSER_DIR/src/UriSetUserInfo.c $URIPARSER_DIR/src/UriShorten.c $URIPARSER_DIR/src/UriVersion.c"
+if test "$PHP_EXTERNAL_URIPARSER" = "no"; then
+  URIPARSER_DIR="uriparser"
+  URIPARSER_SOURCES="$URIPARSER_DIR/src/UriCommon.c $URIPARSER_DIR/src/UriCompare.c $URIPARSER_DIR/src/UriCopy.c \
+  $URIPARSER_DIR/src/UriEscape.c $URIPARSER_DIR/src/UriFile.c $URIPARSER_DIR/src/UriIp4.c $URIPARSER_DIR/src/UriIp4Base.c \
+  $URIPARSER_DIR/src/UriMemory.c $URIPARSER_DIR/src/UriNormalize.c $URIPARSER_DIR/src/UriNormalizeBase.c \
+  $URIPARSER_DIR/src/UriParse.c $URIPARSER_DIR/src/UriParseBase.c $URIPARSER_DIR/src/UriQuery.c \
+  $URIPARSER_DIR/src/UriRecompose.c $URIPARSER_DIR/src/UriResolve.c $URIPARSER_DIR/src/UriSetFragment.c \
+  $URIPARSER_DIR/src/UriSetHostAuto.c $URIPARSER_DIR/src/UriSetHostCommon.c $URIPARSER_DIR/src/UriSetHostIp4.c \
+  $URIPARSER_DIR/src/UriSetHostIp6.c $URIPARSER_DIR/src/UriSetHostIpFuture.c $URIPARSER_DIR/src/UriSetHostRegName.c \
+  $URIPARSER_DIR/src/UriSetPath.c $URIPARSER_DIR/src/UriSetPort.c $URIPARSER_DIR/src/UriSetQuery.c \
+  $URIPARSER_DIR/src/UriSetScheme.c $URIPARSER_DIR/src/UriSetUserInfo.c $URIPARSER_DIR/src/UriShorten.c $URIPARSER_DIR/src/UriVersion.c"
+  URI_CFLAGS="-DURI_STATIC_BUILD"
+else
+  PKG_CHECK_MODULES([LIBURIPARSER], [liburiparser >= 0.9.9])
+  PHP_EVAL_LIBLINE([$LIBURIPARSER_LIBS], [URI_SHARED_LIBADD])
+  PHP_EVAL_INCLINE([$LIBURIPARSER_CFLAGS])
+fi
 
-PHP_NEW_EXTENSION(uri, [php_uri.c php_uri_common.c uri_parser_rfc3986.c uri_parser_whatwg.c uri_parser_php_parse_url.c $URIPARSER_SOURCES], [no],,[-I$ext_srcdir/$URIPARSER_DIR/include -DURI_STATIC_BUILD -DZEND_ENABLE_STATIC_TSRMLS_CACHE=1])
+PHP_NEW_EXTENSION(uri, [php_uri.c php_uri_common.c uri_parser_rfc3986.c uri_parser_whatwg.c uri_parser_php_parse_url.c $URIPARSER_SOURCES], [no],,[$URI_CFLAGS -DZEND_ENABLE_STATIC_TSRMLS_CACHE=1])
 PHP_ADD_EXTENSION_DEP(uri, lexbor)
-PHP_ADD_BUILD_DIR($ext_builddir/$URIPARSER_DIR/src $ext_builddir/$URIPARSER_DIR/include)
+
+if test "$PHP_EXTERNAL_URIPARSER" = "no"; then
+  PHP_ADD_BUILD_DIR($ext_builddir/$URIPARSER_DIR/src $ext_builddir/$URIPARSER_DIR/include)
+  PHP_ADD_INCLUDE([$ext_srcdir/$URIPARSER_DIR/include])
+fi
diff --git a/ext/uri/php_uri.c b/ext/uri/php_uri.c
index 0308c8625e0a8..a0e264f04f3e2 100644
--- a/ext/uri/php_uri.c
+++ b/ext/uri/php_uri.c
@@ -30,6 +30,7 @@
 #include "uri_parser_rfc3986.h"
 #include "uri_parser_php_parse_url.h"
 #include "php_uri_arginfo.h"
+#include "uriparser/UriBase.h"
 
 zend_class_entry *uri_rfc3986_uri_ce;
 zend_object_handlers uri_rfc3986_uri_object_handlers;
@@ -1061,8 +1062,13 @@ static PHP_MINIT_FUNCTION(uri)
 static PHP_MINFO_FUNCTION(uri)
 {
 	php_info_print_table_start();
-	php_info_print_table_row(2, "uri support", "active");
-	php_info_print_table_row(2, "uriparser library version", URI_VER_ANSI);
+	php_info_print_table_row(2, "URI support", "active");
+#ifdef URI_STATIC_BUILD
+	php_info_print_table_row(2, "uriparser bundled version", URI_VER_ANSI);
+#else
+	php_info_print_table_row(2, "uriparser compiled version", URI_VER_ANSI);
+	php_info_print_table_row(2, "uriparser loaded version", uriBaseRuntimeVersionA());
+#endif
 	php_info_print_table_end();
 }
 
diff --git a/ext/zip/php_zip.c b/ext/zip/php_zip.c
index d5f7b019eb9ea..604b4033eb156 100644
--- a/ext/zip/php_zip.c
+++ b/ext/zip/php_zip.c
@@ -628,7 +628,6 @@ int php_zip_glob(char *pattern, int pattern_len, zend_long flags, zval *return_v
 			   can be used for simple glob() calls without further error
 			   checking.
 			*/
-			array_init(return_value);
 			return 0;
 		}
 #endif
@@ -637,7 +636,6 @@ int php_zip_glob(char *pattern, int pattern_len, zend_long flags, zval *return_v
 
 	/* now catch the FreeBSD style of "no matches" */
 	if (!globbuf.gl_pathc || !globbuf.gl_pathv) {
-		array_init(return_value);
 		return 0;
 	}