diff --git a/lib/Makefile.am b/lib/Makefile.am
index 54cb0cec..d53fbf58 100644
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -22,11 +22,17 @@ else
 if APPLE_PLATFORM
 libfko_la_LDFLAGS   = -version-info 2:4:0 $(GPGME_LIBS) -export-symbols-regex '^fko_'
 else
+if USE_MINGW
+libfko_la_LDFLAGS   = -version-info 2:4:0 $(GPGME_LIBS) \
+                      -export-symbols-regex '^fko_' -no-undefined \
+                      -Wl,--whole-archive,$(top_builddir)/common/libfko_util.a,--no-whole-archive,-lwsock32,-lws2_32
+else
 libfko_la_LDFLAGS   = -version-info 2:4:0 $(GPGME_LIBS) \
                       -export-symbols-regex '^fko_' \
                       -Wl,--whole-archive,$(top_builddir)/common/libfko_util.a,--no-whole-archive
 endif
 endif
+endif
 
 libfko_la_SOURCES   = $(libfko_source_files)
 
diff --git a/server/access.c b/server/access.c
index 0f76c38e..acea6e38 100644
--- a/server/access.c
+++ b/server/access.c
@@ -2457,9 +2457,9 @@ DECLARE_UTEST(compare_port_list, "check compare_port_list function")
     /* Match any test */
     free_acc_port_list(in1_pl);
     free_acc_port_list(acc_pl);
-    add_port_list_ent(&in1_pl, "udp/6002");
-    add_port_list_ent(&in2_pl, "udp/6002, udp/6003");
-    add_port_list_ent(&acc_pl, "udp/6002, udp/6003");
+    expand_acc_port_list(&in1_pl, "udp/6002");
+    expand_acc_port_list(&in2_pl, "udp/6002, udp/6003");
+    expand_acc_port_list(&acc_pl, "udp/6002, udp/6003");
     CU_ASSERT(compare_port_list(in1_pl, acc_pl, 1) == 1);	/* Only one match is needed from access port list - 1 */
     CU_ASSERT(compare_port_list(in2_pl, acc_pl, 1) == 1);	/* Only match is needed from access port list - 2 */
     CU_ASSERT(compare_port_list(in1_pl, acc_pl, 0) == 1);	/* All ports must match access port list - 1 */