diff --git a/build-debug-sdl2 b/build-debug-sdl2
index ad3c03263..aa717a1ac 100755
--- a/build-debug-sdl2
+++ b/build-debug-sdl2
@@ -28,6 +28,10 @@ if test -z "$x" ; then
     (cd vs2015/sdl2 && ./build-dosbox.sh) || exit 1
 fi
 
+# prefer to compile against our own copy of SDLnet 1.x
+echo Compiling our internal SDLnet 1.x
+(cd vs2015/sdlnet && ./build-dosbox.sh) || exit 1
+
 chmod +x configure
 ./configure --enable-core-inline --enable-debug=heavy --enable-avcodec --prefix=/usr --enable-sdl2 "$@" $opt || exit 1
 make -j3 || exit 1
diff --git a/configure.ac b/configure.ac
index 46c03de0f..edd4238d0 100644
--- a/configure.ac
+++ b/configure.ac
@@ -852,15 +852,13 @@ AH_TEMPLATE(C_MODEM,[Define to 1 to enable internal modem support, requires SDL_
 AH_TEMPLATE(C_IPX,[Define to 1 to enable IPX over Internet networking, requires SDL_net])
 
 # HACK: Don't enable SDL2 net if SDL2
-if test -z "$SDL2_LIBS"; then
-  if test x$have_sdl_net_lib = xyes -a x$have_sdl_net_h = xyes ; then
-   LIBS="$LIBS -lSDL_net"
-   AC_DEFINE(C_SDL_NET,1)
-   AC_DEFINE(C_MODEM,1)
-   AC_DEFINE(C_IPX,1)
-  else 
-   AC_MSG_WARN([Can't find SDL_net, internal modem and ipx disabled])
-  fi
+if test x$have_sdl_net_lib = xyes -a x$have_sdl_net_h = xyes ; then
+ LIBS="$LIBS -lSDL_net"
+ AC_DEFINE(C_SDL_NET,1)
+ AC_DEFINE(C_MODEM,1)
+ AC_DEFINE(C_IPX,1)
+else 
+ AC_MSG_WARN([Can't find SDL_net, internal modem and ipx disabled])
 fi
 
 dnl FEATURE: Whether to support libz, and enable snapshots
diff --git a/vs2015/sdlnet/Makefile.in b/vs2015/sdlnet/Makefile.in
index 93b0a2006..aa28f5cd4 100644
--- a/vs2015/sdlnet/Makefile.in
+++ b/vs2015/sdlnet/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.13.4 from Makefile.am.
+# Makefile.in generated by automake 1.14.1 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994-2013 Free Software Foundation, Inc.
@@ -90,8 +90,8 @@ DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
 	$(top_srcdir)/configure $(am__configure_deps) \
 	$(srcdir)/SDL_net.spec.in $(srcdir)/SDL_net.qpg.in \
 	$(srcdir)/SDL_net.pc.in depcomp $(libSDL_netinclude_HEADERS) \
-	COPYING README config.guess config.sub install-sh missing \
-	ltmain.sh
+	COPYING README compile config.guess config.sub install-sh \
+	missing ltmain.sh
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/acinclude/libtool.m4 \
 	$(top_srcdir)/acinclude/ltoptions.m4 \
@@ -570,14 +570,14 @@ distclean-compile:
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(COMPILE) -c $<
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ $<
 
 .c.obj:
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(COMPILE) -c `$(CYGPATH_W) '$<'`
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
 
 .c.lo:
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
@@ -773,10 +773,16 @@ dist-xz: distdir
 	$(am__post_remove_distdir)
 
 dist-tarZ: distdir
+	@echo WARNING: "Support for shar distribution archives is" \
+	               "deprecated." >&2
+	@echo WARNING: "It will be removed altogether in Automake 2.0" >&2
 	tardir=$(distdir) && $(am__tar) | compress -c >$(distdir).tar.Z
 	$(am__post_remove_distdir)
 
 dist-shar: distdir
+	@echo WARNING: "Support for distribution archives compressed with" \
+		       "legacy program 'compress' is deprecated." >&2
+	@echo WARNING: "It will be removed altogether in Automake 2.0" >&2
 	shar $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).shar.gz
 	$(am__post_remove_distdir)
 
@@ -818,9 +824,10 @@ distcheck: dist
 	  && dc_destdir="$${TMPDIR-/tmp}/am-dc-$$$$/" \
 	  && am__cwd=`pwd` \
 	  && $(am__cd) $(distdir)/_build \
-	  && ../configure --srcdir=.. --prefix="$$dc_install_base" \
+	  && ../configure \
 	    $(AM_DISTCHECK_CONFIGURE_FLAGS) \
 	    $(DISTCHECK_CONFIGURE_FLAGS) \
+	    --srcdir=.. --prefix="$$dc_install_base" \
 	  && $(MAKE) $(AM_MAKEFLAGS) \
 	  && $(MAKE) $(AM_MAKEFLAGS) dvi \
 	  && $(MAKE) $(AM_MAKEFLAGS) check \