diff -Nru nbd-3.15.1/configure nbd-3.15.1/configure
--- nbd-3.15.1/configure	2016-12-20 11:13:28.000000000 +0000
+++ nbd-3.15.1/configure	2016-12-20 19:24:55.000000000 +0000
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for nbd 3.15.1.
+# Generated by GNU Autoconf 2.69 for nbd debian-3.15.1-1-dirty.
 #
 # Report bugs to <wouter@debian.org>.
 #
@@ -590,8 +590,8 @@
 # Identity of this package.
 PACKAGE_NAME='nbd'
 PACKAGE_TARNAME='nbd'
-PACKAGE_VERSION='3.15.1'
-PACKAGE_STRING='nbd 3.15.1'
+PACKAGE_VERSION='debian-3.15.1-1-dirty'
+PACKAGE_STRING='nbd debian-3.15.1-1-dirty'
 PACKAGE_BUGREPORT='wouter@debian.org'
 PACKAGE_URL='http://nbd.sourceforge.net/'
 
@@ -1355,7 +1355,7 @@
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures nbd 3.15.1 to adapt to many kinds of systems.
+\`configure' configures nbd debian-3.15.1-1-dirty to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1426,7 +1426,7 @@
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of nbd 3.15.1:";;
+     short | recursive ) echo "Configuration of nbd debian-3.15.1-1-dirty:";;
    esac
   cat <<\_ACEOF
 
@@ -1559,7 +1559,7 @@
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-nbd configure 3.15.1
+nbd configure debian-3.15.1-1-dirty
 generated by GNU Autoconf 2.69
 
 Copyright (C) 2012 Free Software Foundation, Inc.
@@ -2268,7 +2268,7 @@
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by nbd $as_me 3.15.1, which was
+It was created by nbd $as_me debian-3.15.1-1-dirty, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   $ $0 $@
@@ -3132,7 +3132,7 @@
 
 # Define the identity of the package.
  PACKAGE='nbd'
- VERSION='3.15.1'
+ VERSION='debian-3.15.1-1-dirty'
 
 
 cat >>confdefs.h <<_ACEOF
@@ -15326,7 +15326,7 @@
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by nbd $as_me 3.15.1, which was
+This file was extended by nbd $as_me debian-3.15.1-1-dirty, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -15393,7 +15393,7 @@
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
 ac_cs_version="\\
-nbd config.status 3.15.1
+nbd config.status debian-3.15.1-1-dirty
 configured by $0, generated by GNU Autoconf 2.69,
   with options \\"\$ac_cs_config\\"
 
diff -Nru nbd-3.15.1/debian/changelog nbd-3.15.1/debian/changelog
--- nbd-3.15.1/debian/changelog	2016-12-20 11:22:53.000000000 +0000
+++ nbd-3.15.1/debian/changelog	2016-12-20 19:36:11.000000000 +0000
@@ -1,3 +1,10 @@
+nbd (1:3.15.1-2) unstable; urgency=medium
+
+  * Build nbd-client a second time with GnuTLS disabled, and install
+    that into nbd-client-udeb; Closes: #848862.
+
+ -- Wouter Verhelst <wouter@debian.org>  Tue, 20 Dec 2016 20:36:11 +0100
+
 nbd (1:3.15.1-1) unstable; urgency=medium
 
   * New upstream version; fixes WRITE_ZEROES with STARTTLS combination
diff -Nru nbd-3.15.1/debian/nbd-client-udeb.install nbd-3.15.1/debian/nbd-client-udeb.install
--- nbd-3.15.1/debian/nbd-client-udeb.install	2016-12-20 11:21:36.000000000 +0000
+++ nbd-3.15.1/debian/nbd-client-udeb.install	1970-01-01 00:00:00.000000000 +0000
@@ -1 +0,0 @@
-sbin/nbd-client
diff -Nru nbd-3.15.1/debian/rules nbd-3.15.1/debian/rules
--- nbd-3.15.1/debian/rules	2016-12-20 11:21:36.000000000 +0000
+++ nbd-3.15.1/debian/rules	2016-12-20 19:36:11.000000000 +0000
@@ -18,10 +18,12 @@
 	install -d debian/tmp/usr/share/initramfs-tools/hooks
 	install -d debian/tmp/etc
 	install -d debian/tmp/usr/share/nbd-server
+	install -d debian/nbd-client-udeb/sbin
 	install -m 644 debian/nbd-client.nbdtab debian/tmp/etc/nbdtab
 	install -m 755 debian/nbd-client.initrd debian/tmp/usr/share/initramfs-tools/scripts/local-top/nbd
 	install -m 755 debian/nbd-client.initramfs-hook debian/tmp/usr/share/initramfs-tools/hooks/nbd
 	install -m 644 debian/nbd-server.conf.tmpl debian/tmp/usr/share/nbd-server/nbd-server.conf.tmpl
+	install -m 755 debian/tmp/sbin/min-nbd-client debian/nbd-client-udeb/sbin/nbd-client
 	dh_install -s
 
 override_dh_installinit:
diff -Nru nbd-3.15.1/Makefile.am nbd-3.15.1/Makefile.am
--- nbd-3.15.1/Makefile.am	2016-12-19 23:59:21.000000000 +0000
+++ nbd-3.15.1/Makefile.am	2016-12-20 19:31:46.000000000 +0000
@@ -6,25 +6,33 @@
 noinst_LTLIBRARIES = libnbdsrv.la libcliserv.la
 libcliserv_la_SOURCES = cliserv.h cliserv.c
 libcliserv_la_CFLAGS = @CFLAGS@
-nbd_client_SOURCES = nbd-client.c cliserv.h
+client_srcs = nbd-client.c cliserv.h
 nbd_server_SOURCES = nbd-server.c cliserv.h lfs.h nbd.h nbdsrv.h backend.h \
 	netdb-compat.h
 nbd_trdump_SOURCES = nbd-trdump.c cliserv.h nbd.h
-nbd_client_CFLAGS = @CFLAGS@
+client_flags = @CFLAGS@
 nbd_server_CFLAGS = @CFLAGS@ @GLIB_CFLAGS@
 nbd_trdump_CFLAGS = @CFLAGS@ @GLIB_CFLAGS@
 libnbdsrv_la_SOURCES = nbdsrv.c nbdsrv.h treefiles.c treefiles.h
 libnbdsrv_la_CFLAGS = @CFLAGS@ @GLIB_CFLAGS@
-nbd_client_LDADD = libcliserv.la
+client_libs = libcliserv.la
 nbd_server_LDADD = @GLIB_LIBS@ libnbdsrv.la libcliserv.la
 nbd_trdump_LDADD = libcliserv.la
 make_integrityhuge_SOURCES = make-integrityhuge.c cliserv.h nbd.h nbd-debug.h
 EXTRA_DIST = maketr CodingStyle autogen.sh README.md support/genver.sh
 if GNUTLS
-nbd_client_SOURCES += crypto-gnutls.c crypto-gnutls.h buffer.c buffer.h
-nbd_client_CFLAGS += @GnuTLS_CFLAGS@
-nbd_client_LDADD += @GnuTLS_LIBS@
+sbin_PROGRAMS += min-nbd-client
+min_nbd_client_SOURCES = $(client_srcs)
+min_nbd_client_CFLAGS = $(client_flags) -DNOTLS
+min_nbd_client_LDADD = $(client_libs)
+nbd_client_SOURCES = $(client_srcs) crypto-gnutls.c crypto-gnutls.h buffer.c buffer.h
+nbd_client_CFLAGS = $(client_flags) @GnuTLS_CFLAGS@
+nbd_client_LDADD = $(client_libs) @GnuTLS_LIBS@
 
 nbd_server_CFLAGS += @GnuTLS_CFLAGS@
 nbd_server_LDADD += @GnuTLS_LIBS@
+else
+nbd_client_SOURCES = $(client_srcs)
+nbd_client_CFLAGS = $(client_flags)
+nbd_client_LDADD = $(client_libs)
 endif
diff -Nru nbd-3.15.1/Makefile.in nbd-3.15.1/Makefile.in
--- nbd-3.15.1/Makefile.in	2016-12-20 11:13:29.000000000 +0000
+++ nbd-3.15.1/Makefile.in	2016-12-20 19:32:32.000000000 +0000
@@ -90,12 +90,11 @@
 build_triplet = @build@
 host_triplet = @host@
 bin_PROGRAMS = nbd-server$(EXEEXT) nbd-trdump$(EXEEXT)
+sbin_PROGRAMS = @NBD_CLIENT_NAME@ $(am__EXEEXT_1)
 EXTRA_PROGRAMS = nbd-client$(EXEEXT) make-integrityhuge$(EXEEXT)
-@GNUTLS_TRUE@am__append_1 = crypto-gnutls.c crypto-gnutls.h buffer.c buffer.h
+@GNUTLS_TRUE@am__append_1 = min-nbd-client
 @GNUTLS_TRUE@am__append_2 = @GnuTLS_CFLAGS@
 @GNUTLS_TRUE@am__append_3 = @GnuTLS_LIBS@
-@GNUTLS_TRUE@am__append_4 = @GnuTLS_CFLAGS@
-@GNUTLS_TRUE@am__append_5 = @GnuTLS_LIBS@
 subdir = .
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/support/libtool.m4 \
@@ -133,24 +132,36 @@
 	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(libnbdsrv_la_CFLAGS) \
 	$(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
 am__installdirs = "$(DESTDIR)$(bindir)" "$(DESTDIR)$(sbindir)"
+@GNUTLS_TRUE@am__EXEEXT_1 = min-nbd-client$(EXEEXT)
 PROGRAMS = $(bin_PROGRAMS) $(sbin_PROGRAMS)
 am_make_integrityhuge_OBJECTS = make-integrityhuge.$(OBJEXT)
 make_integrityhuge_OBJECTS = $(am_make_integrityhuge_OBJECTS)
 make_integrityhuge_LDADD = $(LDADD)
+am__min_nbd_client_SOURCES_DIST = nbd-client.c cliserv.h
+am__objects_1 = min_nbd_client-nbd-client.$(OBJEXT)
+@GNUTLS_TRUE@am_min_nbd_client_OBJECTS = $(am__objects_1)
+min_nbd_client_OBJECTS = $(am_min_nbd_client_OBJECTS)
+@GNUTLS_TRUE@min_nbd_client_DEPENDENCIES = $(client_libs)
+min_nbd_client_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \
+	$(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \
+	$(min_nbd_client_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o \
+	$@
 am__nbd_client_SOURCES_DIST = nbd-client.c cliserv.h crypto-gnutls.c \
 	crypto-gnutls.h buffer.c buffer.h
-@GNUTLS_TRUE@am__objects_1 = nbd_client-crypto-gnutls.$(OBJEXT) \
+am__objects_2 = nbd_client-nbd-client.$(OBJEXT)
+@GNUTLS_FALSE@am_nbd_client_OBJECTS = $(am__objects_2)
+@GNUTLS_TRUE@am_nbd_client_OBJECTS = $(am__objects_2) \
+@GNUTLS_TRUE@	nbd_client-crypto-gnutls.$(OBJEXT) \
 @GNUTLS_TRUE@	nbd_client-buffer.$(OBJEXT)
-am_nbd_client_OBJECTS = nbd_client-nbd-client.$(OBJEXT) \
-	$(am__objects_1)
 nbd_client_OBJECTS = $(am_nbd_client_OBJECTS)
-am__DEPENDENCIES_1 =
-nbd_client_DEPENDENCIES = libcliserv.la $(am__DEPENDENCIES_1)
+@GNUTLS_FALSE@nbd_client_DEPENDENCIES = $(client_libs)
+@GNUTLS_TRUE@nbd_client_DEPENDENCIES = $(client_libs)
 nbd_client_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
 	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(nbd_client_CFLAGS) \
 	$(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
 am_nbd_server_OBJECTS = nbd_server-nbd-server.$(OBJEXT)
 nbd_server_OBJECTS = $(am_nbd_server_OBJECTS)
+am__DEPENDENCIES_1 =
 nbd_server_DEPENDENCIES = libnbdsrv.la libcliserv.la \
 	$(am__DEPENDENCIES_1)
 nbd_server_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
@@ -197,11 +208,14 @@
 am__v_CCLD_0 = @echo "  CCLD    " $@;
 am__v_CCLD_1 = 
 SOURCES = $(libcliserv_la_SOURCES) $(libnbdsrv_la_SOURCES) \
-	$(make_integrityhuge_SOURCES) $(nbd_client_SOURCES) \
-	$(nbd_server_SOURCES) $(nbd_trdump_SOURCES)
+	$(make_integrityhuge_SOURCES) $(min_nbd_client_SOURCES) \
+	$(nbd_client_SOURCES) $(nbd_server_SOURCES) \
+	$(nbd_trdump_SOURCES)
 DIST_SOURCES = $(libcliserv_la_SOURCES) $(libnbdsrv_la_SOURCES) \
-	$(make_integrityhuge_SOURCES) $(am__nbd_client_SOURCES_DIST) \
-	$(nbd_server_SOURCES) $(nbd_trdump_SOURCES)
+	$(make_integrityhuge_SOURCES) \
+	$(am__min_nbd_client_SOURCES_DIST) \
+	$(am__nbd_client_SOURCES_DIST) $(nbd_server_SOURCES) \
+	$(nbd_trdump_SOURCES)
 RECURSIVE_TARGETS = all-recursive check-recursive cscopelist-recursive \
 	ctags-recursive dvi-recursive html-recursive info-recursive \
 	install-data-recursive install-dvi-recursive \
@@ -422,26 +436,34 @@
 top_srcdir = @top_srcdir@
 ACLOCAL_AMFLAGS = -I support
 SUBDIRS = . man doc tests systemd gznbd
-sbin_PROGRAMS = @NBD_CLIENT_NAME@
 noinst_LTLIBRARIES = libnbdsrv.la libcliserv.la
 libcliserv_la_SOURCES = cliserv.h cliserv.c
 libcliserv_la_CFLAGS = @CFLAGS@
-nbd_client_SOURCES = nbd-client.c cliserv.h $(am__append_1)
+client_srcs = nbd-client.c cliserv.h
 nbd_server_SOURCES = nbd-server.c cliserv.h lfs.h nbd.h nbdsrv.h backend.h \
 	netdb-compat.h
 
 nbd_trdump_SOURCES = nbd-trdump.c cliserv.h nbd.h
-nbd_client_CFLAGS = @CFLAGS@ $(am__append_2)
-nbd_server_CFLAGS = @CFLAGS@ @GLIB_CFLAGS@ $(am__append_4)
+client_flags = @CFLAGS@
+nbd_server_CFLAGS = @CFLAGS@ @GLIB_CFLAGS@ $(am__append_2)
 nbd_trdump_CFLAGS = @CFLAGS@ @GLIB_CFLAGS@
 libnbdsrv_la_SOURCES = nbdsrv.c nbdsrv.h treefiles.c treefiles.h
 libnbdsrv_la_CFLAGS = @CFLAGS@ @GLIB_CFLAGS@
-nbd_client_LDADD = libcliserv.la $(am__append_3)
+client_libs = libcliserv.la
 nbd_server_LDADD = @GLIB_LIBS@ libnbdsrv.la libcliserv.la \
-	$(am__append_5)
+	$(am__append_3)
 nbd_trdump_LDADD = libcliserv.la
 make_integrityhuge_SOURCES = make-integrityhuge.c cliserv.h nbd.h nbd-debug.h
 EXTRA_DIST = maketr CodingStyle autogen.sh README.md support/genver.sh
+@GNUTLS_TRUE@min_nbd_client_SOURCES = $(client_srcs)
+@GNUTLS_TRUE@min_nbd_client_CFLAGS = $(client_flags) -DNOTLS
+@GNUTLS_TRUE@min_nbd_client_LDADD = $(client_libs)
+@GNUTLS_FALSE@nbd_client_SOURCES = $(client_srcs)
+@GNUTLS_TRUE@nbd_client_SOURCES = $(client_srcs) crypto-gnutls.c crypto-gnutls.h buffer.c buffer.h
+@GNUTLS_FALSE@nbd_client_CFLAGS = $(client_flags)
+@GNUTLS_TRUE@nbd_client_CFLAGS = $(client_flags) @GnuTLS_CFLAGS@
+@GNUTLS_FALSE@nbd_client_LDADD = $(client_libs)
+@GNUTLS_TRUE@nbd_client_LDADD = $(client_libs) @GnuTLS_LIBS@
 all: config.h
 	$(MAKE) $(AM_MAKEFLAGS) all-recursive
 
@@ -615,6 +637,10 @@
 	@rm -f make-integrityhuge$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(make_integrityhuge_OBJECTS) $(make_integrityhuge_LDADD) $(LIBS)
 
+min-nbd-client$(EXEEXT): $(min_nbd_client_OBJECTS) $(min_nbd_client_DEPENDENCIES) $(EXTRA_min_nbd_client_DEPENDENCIES) 
+	@rm -f min-nbd-client$(EXEEXT)
+	$(AM_V_CCLD)$(min_nbd_client_LINK) $(min_nbd_client_OBJECTS) $(min_nbd_client_LDADD) $(LIBS)
+
 nbd-client$(EXEEXT): $(nbd_client_OBJECTS) $(nbd_client_DEPENDENCIES) $(EXTRA_nbd_client_DEPENDENCIES) 
 	@rm -f nbd-client$(EXEEXT)
 	$(AM_V_CCLD)$(nbd_client_LINK) $(nbd_client_OBJECTS) $(nbd_client_LDADD) $(LIBS)
@@ -637,6 +663,7 @@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libnbdsrv_la-nbdsrv.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libnbdsrv_la-treefiles.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/make-integrityhuge.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/min_nbd_client-nbd-client.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/nbd_client-buffer.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/nbd_client-crypto-gnutls.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/nbd_client-nbd-client.Po@am__quote@
@@ -688,6 +715,20 @@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libnbdsrv_la_CFLAGS) $(CFLAGS) -c -o libnbdsrv_la-treefiles.lo `test -f 'treefiles.c' || echo '$(srcdir)/'`treefiles.c
 
+min_nbd_client-nbd-client.o: nbd-client.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(min_nbd_client_CFLAGS) $(CFLAGS) -MT min_nbd_client-nbd-client.o -MD -MP -MF $(DEPDIR)/min_nbd_client-nbd-client.Tpo -c -o min_nbd_client-nbd-client.o `test -f 'nbd-client.c' || echo '$(srcdir)/'`nbd-client.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/min_nbd_client-nbd-client.Tpo $(DEPDIR)/min_nbd_client-nbd-client.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='nbd-client.c' object='min_nbd_client-nbd-client.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(min_nbd_client_CFLAGS) $(CFLAGS) -c -o min_nbd_client-nbd-client.o `test -f 'nbd-client.c' || echo '$(srcdir)/'`nbd-client.c
+
+min_nbd_client-nbd-client.obj: nbd-client.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(min_nbd_client_CFLAGS) $(CFLAGS) -MT min_nbd_client-nbd-client.obj -MD -MP -MF $(DEPDIR)/min_nbd_client-nbd-client.Tpo -c -o min_nbd_client-nbd-client.obj `if test -f 'nbd-client.c'; then $(CYGPATH_W) 'nbd-client.c'; else $(CYGPATH_W) '$(srcdir)/nbd-client.c'; fi`
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/min_nbd_client-nbd-client.Tpo $(DEPDIR)/min_nbd_client-nbd-client.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='nbd-client.c' object='min_nbd_client-nbd-client.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(min_nbd_client_CFLAGS) $(CFLAGS) -c -o min_nbd_client-nbd-client.obj `if test -f 'nbd-client.c'; then $(CYGPATH_W) 'nbd-client.c'; else $(CYGPATH_W) '$(srcdir)/nbd-client.c'; fi`
+
 nbd_client-nbd-client.o: nbd-client.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(nbd_client_CFLAGS) $(CFLAGS) -MT nbd_client-nbd-client.o -MD -MP -MF $(DEPDIR)/nbd_client-nbd-client.Tpo -c -o nbd_client-nbd-client.o `test -f 'nbd-client.c' || echo '$(srcdir)/'`nbd-client.c
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/nbd_client-nbd-client.Tpo $(DEPDIR)/nbd_client-nbd-client.Po
diff -Nru nbd-3.15.1/nbd-client.c nbd-3.15.1/nbd-client.c
--- nbd-3.15.1/nbd-client.c	2016-12-19 23:59:21.000000000 +0000
+++ nbd-3.15.1/nbd-client.c	2016-12-20 19:32:27.000000000 +0000
@@ -47,7 +47,7 @@
 #define MY_NAME "nbd_client"
 #include "cliserv.h"
 
-#if HAVE_GNUTLS
+#if HAVE_GNUTLS && !defined(NOTLS)
 #include "crypto-gnutls.h"
 #endif
 
@@ -309,7 +309,7 @@
 	if (write(sock, &client_flags, sizeof(client_flags)) < 0)
 		err("Failed/2.1: %m");
 
-#if HAVE_GNUTLS
+#if HAVE_GNUTLS && !defined(NOTLS)
         /* TLS */
         if (tls) {
 		int plainfd[2]; // [0] is used by the proxy, [1] is used by NBD
@@ -676,7 +676,7 @@
 	fprintf(stderr, "Or   : nbd-client -c nbd_device\n");
 	fprintf(stderr, "Or   : nbd-client -h|--help\n");
 	fprintf(stderr, "Or   : nbd-client -l|--list host\n");
-#if HAVE_GNUTLS
+#if HAVE_GNUTLS && !defined(NOTLS)
 	fprintf(stderr, "All commands that connect to a host also take:\n\t[-F|-certfile certfile] [-K|-keyfile keyfile]\n\t[-A|-cacertfile cacertfile] [-H|-tlshostname hostname] [-x|-enable-tls]\n");
 #endif
 	fprintf(stderr, "Default value for blocksize is 1024 (recommended for ethernet)\n");
@@ -755,7 +755,7 @@
 
 	logging(MY_NAME);
 
-#if HAVE_GNUTLS
+#if HAVE_GNUTLS && !defined(NOTLS)
         tlssession_init();
 #endif
 
@@ -847,7 +847,7 @@
 		case 'u':
 			b_unix = 1;
 			break;
-#if HAVE_GNUTLS
+#if HAVE_GNUTLS && !defined(NOTLS)
 		case 'x':
 			tls = true;
 			break;