diff --git a/configure.in b/configure.in
index afacbf68d..8f3bbdf12 100644
--- a/configure.in
+++ b/configure.in
@@ -156,8 +156,8 @@ esac
 )
 
 AC_ARG_ENABLE(gccwarnings,
-	AS_HELP_STRING([--enable-gccwarnings], [Enable compiler warnings, default no]),
-	[gcc_warnings=$enableval], [gcc_warnings=no])
+	AS_HELP_STRING([--enable-gccwarnings], [Enable compiler warnings, default yes]),
+	[gcc_warnings=$enableval], [gcc_warnings=yes])
 
 AC_ARG_ENABLE(parport,
   AS_HELP_STRING([--enable-parport], [Enable building the pc parallel port driver]), 
@@ -243,6 +243,10 @@ AC_ARG_ENABLE(jlink,
   AS_HELP_STRING([--enable-jlink], [Enable building support for the Segger J-Link JTAG Programmer]),
   [build_jlink=$enableval], [build_jlink=no])
 
+AC_ARG_ENABLE(vsllink,
+  AS_HELP_STRING([--enable-vsllink], [Enable building support for the Versaloon-Link JTAG Programmer]),
+  [build_vsllink=$enableval], [build_vsllink=no])
+
 AC_ARG_ENABLE(rlink,
   AS_HELP_STRING([--enable-rlink], [Enable building support for the Raisonance RLink JTAG Programmer]),
   [build_rlink=$enableval], [build_rlink=no])
@@ -412,6 +416,12 @@ else
   AC_DEFINE(BUILD_JLINK, 0, [0 if you don't want the J-Link JTAG driver.])
 fi
 
+if test $build_vsllink = yes; then
+  AC_DEFINE(BUILD_VSLLINK, 1, [1 if you want the Versaloon-Link JTAG driver.])
+else
+  AC_DEFINE(BUILD_VSLLINK, 0, [0 if you don't want the Versaloon-Link JTAG driver.])
+fi
+
 if test $build_rlink = yes; then
   AC_DEFINE(BUILD_RLINK, 1, [1 if you want the RLink JTAG driver.])
 else
@@ -631,6 +641,7 @@ AM_CONDITIONAL(PRESTO_FTD2XX, test $build_presto_ftd2xx = yes)
 AM_CONDITIONAL(USBPROG, test $build_usbprog = yes)
 AM_CONDITIONAL(OOCD_TRACE, test $build_oocd_trace = yes)
 AM_CONDITIONAL(JLINK, test $build_jlink = yes)
+AM_CONDITIONAL(VSLLINK, test $build_vsllink = yes)
 AM_CONDITIONAL(RLINK, test $build_rlink = yes)
 AM_CONDITIONAL(IS_CYGWIN, test $is_cygwin = yes)
 AM_CONDITIONAL(IS_MINGW, test $is_mingw = yes)
diff --git a/doc/openocd.texi b/doc/openocd.texi
index fdbed6b59..70e8c93c3 100644
--- a/doc/openocd.texi
+++ b/doc/openocd.texi
@@ -222,6 +222,8 @@ should be included:
 @item
 @option{--enable-jlink} - From SEGGER
 @item
+@option{--enable-vsllink}
+@item
 @option{--enable-rlink} - Raisonance.com dongle.
 @end itemize
 
@@ -395,6 +397,9 @@ Raisonance has an adapter called @b{RLink}.  It exists in a stripped-down form o
 
 @item @b{USB - Presto} 
 @* Link: @url{http://tools.asix.net/prg_presto.htm}
+
+@item @b{Versaloon-Link}
+@* Link: @url{http://www.simonqian.com/en/Versaloon}
 @end itemize
 
 @section IBM PC Parallel Printer Port Based
@@ -1140,6 +1145,9 @@ libusb.
 
 @item @b{rlink}
 @* Raisonance RLink usb adapter
+
+@item @b{vsllink}
+@* vsllink is part of Versaloon which is a versatile USB programmer.
 @comment - End parameters
 @end itemize
 @comment - End Interface
diff --git a/src/Makefile.am b/src/Makefile.am
index b25429178..0e0f50e48 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -50,10 +50,14 @@ else
 if RLINK
 LIBUSB = -lusb
 else
+if VSLLINK
+LIBUSB = -lusb
+else
 LIBUSB =
 endif
 endif
 endif
+endif
 
 
 
diff --git a/src/jtag/Makefile.am b/src/jtag/Makefile.am
index 0c5812964..8bb0ea21a 100644
--- a/src/jtag/Makefile.am
+++ b/src/jtag/Makefile.am
@@ -96,7 +96,13 @@ else
 RLINKFILES =
 endif
 
+if VSLLINK
+VSLLINKFILES = vsllink.c
+else
+VSLLINKFILES =
+endif
+
 libjtag_a_SOURCES = jtag.c $(BITBANGFILES) $(PARPORTFILES) $(DUMMYFILES) $(FT2232FILES) $(AMTJTAGACCELFILES) $(EP93XXFILES) \
-	$(AT91RM9200FILES) $(GW16012FILES) $(BITQFILES) $(PRESTOFILES) $(USBPROGFILES) $(ECOSBOARDFILES) $(JLINKFILES) $(RLINKFILES)
+	$(AT91RM9200FILES) $(GW16012FILES) $(BITQFILES) $(PRESTOFILES) $(USBPROGFILES) $(ECOSBOARDFILES) $(JLINKFILES) $(RLINKFILES) $(VSLLINKFILES)
 
 noinst_HEADERS = bitbang.h jtag.h
diff --git a/src/jtag/jtag.c b/src/jtag/jtag.c
index 16dbbd22f..48921ebc4 100644
--- a/src/jtag/jtag.c
+++ b/src/jtag/jtag.c
@@ -196,6 +196,10 @@ static int hasKHz = 0;
 	extern jtag_interface_t jlink_interface;
 #endif
 
+#if BUILD_VSLLINK == 1
+	extern jtag_interface_t vsllink_interface;
+#endif
+
 #if BUILD_RLINK == 1
 	extern jtag_interface_t rlink_interface;
 #endif
@@ -237,6 +241,9 @@ jtag_interface_t *jtag_interfaces[] = {
 #if BUILD_JLINK == 1
 	&jlink_interface,
 #endif
+#if BUILD_VSLLINK == 1
+	&vsllink_interface,
+#endif
 #if BUILD_RLINK == 1
 	&rlink_interface,
 #endif
diff --git a/testing/build.test1/Makefile.openocd b/testing/build.test1/Makefile.openocd
index dbe8ac10e..6b0cb56ff 100755
--- a/testing/build.test1/Makefile.openocd
+++ b/testing/build.test1/Makefile.openocd
@@ -40,7 +40,7 @@ MINGW32_EASY_PERMUTATIONS += ftd2xx
 CONFIG_OPTIONS_win32_libftdi  = --enable-parport --enable-ft2232_libftdi
 
 # Default build for win32... is the ftd2xx type build.
-PERMUTE_win32          ?= $(BUILD_SYSNAME)_ftd2xx
+PERMUTE_win32          ?= ftd2xx
 CONFIG_OPTIONS_win32   ?= $(CONFIG_OPTIONS_win32_$(PERMUTE_win32))
 CONFIG_OPTIONS_cygwin   = $(CONFIG_OPTIONS_win32)
 CONFIG_OPTIONS_mingw32  = $(CONFIG_OPTIONS_win32)