diff --git a/tests/Makefile.am b/tests/Makefile.am
index 78744bf2c..ab63d9d86 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -57,7 +57,9 @@ rigctlsync_CFLAGS = $(AM_CFLAGS) $(PTHREAD_CFLAGS) -I$(top_builddir)/security
 if HAVE_LIBUSB
     rigtestlibusb_CFLAGS = $(AM_CFLAGS) $(PTHREAD_CFLAGS) $(LIBUSB_CFLAGS)
 endif
-testsecurity_CFLAGS = $(AM_CFLAGS) $(PTHREAD_CFLAGS) -I$(top_srcdir)/security
+
+# Document building testsecurity
+### testsecurity_CFLAGS = $(AM_CFLAGS) $(PTHREAD_CFLAGS) -I$(top_srcdir)/security
 
 rigctl_LDADD = $(PTHREAD_LIBS) $(READLINE_LIBS) $(LDADD)
 rigctld_LDADD = $(NET_LIBS) $(PTHREAD_LIBS) $(LDADD) $(READLINE_LIBS)
@@ -73,6 +75,9 @@ if HAVE_LIBUSB
     rigtestlibusb_LDADD = $(LIBUSB_LIBS)
 endif
 
+# Document linking testsecurity
+### testsecurity_LDADD = $(PTHREAD_LIBS) $(LDADD) $(top_builddir)/security/libsecurity.la
+
 # Linker options
 rigctl_LDFLAGS = $(WINEXELDFLAGS)
 rigswr_LDFLAGS = $(WINEXELDFLAGS)
@@ -90,6 +95,8 @@ if HAVE_LIBUSB
     rigtestlibusb_LDFLAGS = $(WINEXELDFLAGS)
 endif
 
+# Document linking testsecurity with MinGW
+### testsecurity_LDFLAGS = $(WINEXELDFLAGS)
 
 if HTML_MATRIX
 EXTRA_PROGRAMS = rigmatrix
diff --git a/tests/example.c b/tests/example.c
index 2e5ea6b32..7ded7a202 100644
--- a/tests/example.c
+++ b/tests/example.c
@@ -90,7 +90,7 @@ int main()
 
     if (status != RIG_OK) { printf("Get mode failed?? Err=%s\n", rigerror(status)); }
 
-    printf("Current mode = 0x%lX = %s, width = %ld\n", mode, rig_strrmode(mode),
+    printf("Current mode = 0x%llX = %s, width = %ld\n", (unsigned long long)mode, rig_strrmode(mode),
            width);
 
     /* rig power output */
diff --git a/tests/testsecurity.c b/tests/testsecurity.c
index fe13b751b..415e3bf99 100644
--- a/tests/testsecurity.c
+++ b/tests/testsecurity.c
@@ -18,6 +18,7 @@
 #include <stdio.h>
 #include <string.h>
 #ifdef _WIN32
+#include <winsock2.h>
 #include <windows.h>
 //#include <Wincrypt.h>
 #else