diff --git a/configure.ac b/configure.ac
index a671de11..63391889 100644
--- a/configure.ac
+++ b/configure.ac
@@ -880,6 +880,18 @@ else
 	INSTALL_GETDNS_QUERY="install-getdns_query"
 	UNINSTALL_GETDNS_QUERY="uninstall-getdns_query"
 fi
+AC_ARG_WITH(fd-setsize, AS_HELP_STRING([--with-fd-setsize=size],
+	[Set maximum file descriptor number that can be used by select]),
+	[], [withval="no"])
+case "$withval" in
+	no)
+		;;
+	*)
+		AC_DEFINE_UNQUOTED([FD_SETSIZE], [$withval], [Alternate value for the FD_SETSIZE])
+		my_enable_unbound_event_api=1
+		;;
+esac
+
 AC_SUBST(GETDNS_QUERY)
 AC_SUBST(INSTALL_GETDNS_QUERY)
 AC_SUBST(UNINSTALL_GETDNS_QUERY)
@@ -1000,7 +1012,9 @@ AH_BOTTOM([
  * (and nescessary to make our custom eventloop work)
  * See: https://support.microsoft.com/en-us/kb/111855
  */
+#ifndef FD_SETSIZE
 #define FD_SETSIZE 1024
+#endif
 
 #define PRIsz "%Iu"
 #else
diff --git a/src/libgetdns.symbols b/src/libgetdns.symbols
index 7fde49c7..71564132 100644
--- a/src/libgetdns.symbols
+++ b/src/libgetdns.symbols
@@ -9,10 +9,10 @@ getdns_context_detach_eventloop
 getdns_context_get_api_information
 getdns_context_get_append_name
 getdns_context_get_dns_root_servers
-getdns_context_get_dnssec_allowed_skew
-getdns_context_get_dnssec_trust_anchors
 getdns_context_get_dns_transport
 getdns_context_get_dns_transport_list
+getdns_context_get_dnssec_allowed_skew
+getdns_context_get_dnssec_trust_anchors
 getdns_context_get_edns_client_subnet_private
 getdns_context_get_edns_do_bit
 getdns_context_get_edns_extended_rcode
@@ -35,10 +35,10 @@ getdns_context_run
 getdns_context_set_append_name
 getdns_context_set_context_update_callback
 getdns_context_set_dns_root_servers
-getdns_context_set_dnssec_allowed_skew
-getdns_context_set_dnssec_trust_anchors
 getdns_context_set_dns_transport
 getdns_context_set_dns_transport_list
+getdns_context_set_dnssec_allowed_skew
+getdns_context_set_dnssec_trust_anchors
 getdns_context_set_edns_client_subnet_private
 getdns_context_set_edns_do_bit
 getdns_context_set_edns_extended_rcode
diff --git a/src/mk-symfiles.sh b/src/mk-symfiles.sh
index 590a6c18..878196b9 100755
--- a/src/mk-symfiles.sh
+++ b/src/mk-symfiles.sh
@@ -4,7 +4,7 @@ write_symbols() {
 	OUTPUT=$1
 	shift
 	grep 'getdns_[0-9a-zA-Z_]*(' $* | grep -v '^#' | grep -v 'INLINE' \
-	| sed -e 's/(.*$//g' -e 's/^.*getdns_/getdns_/g' | sort | uniq > $OUTPUT
+	| sed -e 's/(.*$//g' -e 's/^.*getdns_/getdns_/g' | LC_ALL=C sort | uniq > $OUTPUT
 }
 
 write_symbols libgetdns.symbols getdns/getdns.h.in getdns/getdns_extra.h.in
diff --git a/src/test/tpkg/250-json-pointers.tpkg/250-json-pointers.Makefile b/src/test/tpkg/250-json-pointers.tpkg/250-json-pointers.Makefile
index 708341a1..c297df6d 100644
--- a/src/test/tpkg/250-json-pointers.tpkg/250-json-pointers.Makefile
+++ b/src/test/tpkg/250-json-pointers.tpkg/250-json-pointers.Makefile
@@ -11,5 +11,5 @@ LDLIBS=$(builddir)/src/libgetdns.la
 	$(LIBTOOL) --quiet --tag=CC --mode=compile $(CC) $(CFLAGS) -c $< -o $@
 
 $(testname): $(testname).lo
-	$(LIBTOOL) --tag=CC --mode=link $(CC) $(LDLIBS) $(LDFLAGS) -o $@ $<
+	$(LIBTOOL) --tag=CC --mode=link $(CC) $(LDLIBS) $(LDFLAGS) -o $(testname) $(testname).lo
 
diff --git a/src/test/tpkg/260-conversion-functions.tpkg/260-conversion-functions.Makefile b/src/test/tpkg/260-conversion-functions.tpkg/260-conversion-functions.Makefile
index 708341a1..c297df6d 100644
--- a/src/test/tpkg/260-conversion-functions.tpkg/260-conversion-functions.Makefile
+++ b/src/test/tpkg/260-conversion-functions.tpkg/260-conversion-functions.Makefile
@@ -11,5 +11,5 @@ LDLIBS=$(builddir)/src/libgetdns.la
 	$(LIBTOOL) --quiet --tag=CC --mode=compile $(CC) $(CFLAGS) -c $< -o $@
 
 $(testname): $(testname).lo
-	$(LIBTOOL) --tag=CC --mode=link $(CC) $(LDLIBS) $(LDFLAGS) -o $@ $<
+	$(LIBTOOL) --tag=CC --mode=link $(CC) $(LDLIBS) $(LDFLAGS) -o $(testname) $(testname).lo
 
diff --git a/src/test/tpkg/270-header-extension.tpkg/270-header-extension.Makefile b/src/test/tpkg/270-header-extension.tpkg/270-header-extension.Makefile
index 708341a1..c297df6d 100644
--- a/src/test/tpkg/270-header-extension.tpkg/270-header-extension.Makefile
+++ b/src/test/tpkg/270-header-extension.tpkg/270-header-extension.Makefile
@@ -11,5 +11,5 @@ LDLIBS=$(builddir)/src/libgetdns.la
 	$(LIBTOOL) --quiet --tag=CC --mode=compile $(CC) $(CFLAGS) -c $< -o $@
 
 $(testname): $(testname).lo
-	$(LIBTOOL) --tag=CC --mode=link $(CC) $(LDLIBS) $(LDFLAGS) -o $@ $<
+	$(LIBTOOL) --tag=CC --mode=link $(CC) $(LDLIBS) $(LDFLAGS) -o $(testname) $(testname).lo
 
diff --git a/src/test/tpkg/run-all-lcov.sh b/src/test/tpkg/run-all-lcov.sh
index 5e5bfffe..37fdb5bd 100755
--- a/src/test/tpkg/run-all-lcov.sh
+++ b/src/test/tpkg/run-all-lcov.sh
@@ -11,7 +11,7 @@ do
     # after the test is complete, we need to collect the coverage data
     INFO_FILE=`echo $TEST_PKG | sed 's/.tpkg$//'`.info
     geninfo $SRCDIR/.. -o $INFO_FILE
-    LCOV_MERGE="$LCOV_MERGE -a $INFO_FILE"
+    [ -s $INFO_FILE ] && LCOV_MERGE="$LCOV_MERGE -a $INFO_FILE"
 done
 lcov $LCOV_MERGE -o run-all.info
 genhtml run-all.info --output-directory coverage-html