diff --git a/Makefile b/Makefile
index 9629f0a6..134734e9 100644
--- a/Makefile
+++ b/Makefile
@@ -84,6 +84,7 @@ LIB_SOURCES =	src/libhttp.c						\
 		src/httplib_get_request_len.c				\
 		src/httplib_get_response.c				\
 		src/httplib_get_response_code_text.c			\
+		src/httplib_get_server_ports.c				\
 		src/httplib_get_system_name.c				\
 		src/httplib_get_uri_type.c				\
 		src/httplib_get_user_connection_data.c			\
diff --git a/src/httplib_get_server_ports.c b/src/httplib_get_server_ports.c
new file mode 100644
index 00000000..72bedf62
--- /dev/null
+++ b/src/httplib_get_server_ports.c
@@ -0,0 +1,66 @@
+/* 
+ * Copyright (c) 2016 Lammert Bies
+ * Copyright (c) 2013-2016 the Civetweb developers
+ * Copyright (c) 2004-2013 Sergey Lyubka
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+
+
+
+#include "libhttp-private.h"
+
+
+
+int mg_get_server_ports(const struct mg_context *ctx, int size, struct mg_server_ports *ports) {
+
+	int i;
+	int cnt = 0;
+
+	if (size <= 0) { return -1; }
+	memset(ports, 0, sizeof(*ports) * (size_t)size);
+	if (!ctx) { return -1; }
+	if (!ctx->listening_sockets) { return -1; }
+
+	for (i = 0; (i < size) && (i < (int)ctx->num_listening_sockets); i++) {
+
+		ports[cnt].port =
+#if defined(USE_IPV6)
+		    (ctx->listening_sockets[i].lsa.sa.sa_family == AF_INET6)
+		        ? ntohs(ctx->listening_sockets[i].lsa.sin6.sin6_port)
+		        :
+#endif
+		        ntohs(ctx->listening_sockets[i].lsa.sin.sin_port);
+		ports[cnt].is_ssl = ctx->listening_sockets[i].is_ssl;
+		ports[cnt].is_redirect = ctx->listening_sockets[i].ssl_redir;
+
+		if (ctx->listening_sockets[i].lsa.sa.sa_family == AF_INET) {
+			/* IPv4 */
+			ports[cnt].protocol = 1;
+			cnt++;
+		} else if (ctx->listening_sockets[i].lsa.sa.sa_family == AF_INET6) {
+			/* IPv6 */
+			ports[cnt].protocol = 3;
+			cnt++;
+		}
+	}
+
+	return cnt;
+
+}  /* mg_get_server_ports */
diff --git a/src/libhttp.c b/src/libhttp.c
index 7ad162f4..1516c6e5 100644
--- a/src/libhttp.c
+++ b/src/libhttp.c
@@ -828,43 +828,6 @@ void XX_httplib_set_thread_name(const char *threadName) {
 
 
 
-int mg_get_server_ports(const struct mg_context *ctx, int size, struct mg_server_ports *ports) {
-
-	int i;
-	int cnt = 0;
-
-	if (size <= 0) { return -1; }
-	memset(ports, 0, sizeof(*ports) * (size_t)size);
-	if (!ctx) { return -1; }
-	if (!ctx->listening_sockets) { return -1; }
-
-	for (i = 0; (i < size) && (i < (int)ctx->num_listening_sockets); i++) {
-
-		ports[cnt].port =
-#if defined(USE_IPV6)
-		    (ctx->listening_sockets[i].lsa.sa.sa_family == AF_INET6)
-		        ? ntohs(ctx->listening_sockets[i].lsa.sin6.sin6_port)
-		        :
-#endif
-		        ntohs(ctx->listening_sockets[i].lsa.sin.sin_port);
-		ports[cnt].is_ssl = ctx->listening_sockets[i].is_ssl;
-		ports[cnt].is_redirect = ctx->listening_sockets[i].ssl_redir;
-
-		if (ctx->listening_sockets[i].lsa.sa.sa_family == AF_INET) {
-			/* IPv4 */
-			ports[cnt].protocol = 1;
-			cnt++;
-		} else if (ctx->listening_sockets[i].lsa.sa.sa_family == AF_INET6) {
-			/* IPv6 */
-			ports[cnt].protocol = 3;
-			cnt++;
-		}
-	}
-
-	return cnt;
-}
-
-
 void XX_httplib_sockaddr_to_string(char *buf, size_t len, const union usa *usa) {
 
 	buf[0] = '\0';