--- libassuan/src/Makefile.am
+++ libassuan/src/Makefile.am
@@ -81,7 +81,7 @@
 
 if HAVE_W32_SYSTEM
 
-LTRCCOMPILE = $(LIBTOOL) --mode=compile $(RC) \
+LTRCCOMPILE = $(LIBTOOL) --mode=compile --tag=RC $(RC) \
      `echo $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) | \
      sed -e 's/-I/--include-dir /g;s/-D/--define /g'`
 
--- libassuan.orig/src/mkheader.c	2013-03-15 20:26:09.000000000 +0100
+++ libassuan/src/mkheader.c	2017-09-24 14:17:33.584583300 +0200
@@ -99,7 +99,7 @@
                "# include <unistd.h>\n"
                "#endif\n", stdout);
       else
-        fputs ("#include <unistd.h>\n", stdout);
+        fputs ("#include <io.h>\n", stdout);
     }
   else if (!strcmp (tag, "include:types"))
     {
diff -ru libassuan.orig/src/Makefile.am libassuan/src/Makefile.am
--- libassuan.orig/src/Makefile.am	2017-09-24 14:20:05.906065400 +0200
+++ libassuan/src/Makefile.am	2017-09-24 14:40:59.038850200 +0200
@@ -142,11 +142,11 @@
               $(DESTDIR)$(bindir)/gpgcedev.dll
 endif
 
-mkheader: mkheader.c Makefile
+mkheader$(EXEEXT): mkheader.c Makefile
 	$(CC_FOR_BUILD) -I. -I$(srcdir) -o $@ $(srcdir)/mkheader.c
 
-assuan.h: assuan.h.in mkheader $(parts_of_assuan_h)
-	./mkheader $(host_os) $(srcdir)/assuan.h.in \
+assuan.h: assuan.h.in mkheader$(EXEEXT) $(parts_of_assuan_h)
+	./mkheader$(EXEEXT) $(host_os) $(srcdir)/assuan.h.in \
                    @VERSION@ @VERSION_NUMBER@ >$@
 
 
diff -ru libassuan.orig/src/assuan-handler.c libassuan/src/assuan-handler.c
--- libassuan.orig/src/assuan-handler.c 2016-06-25 16:27:49.000000000 +0200
+++ libassuan/src/assuan-handler.c      2017-09-24 15:32:51.200956200 +0200
@@ -395,7 +395,7 @@

   { "INPUT",  std_handler_input, std_help_input, 0 },
   { "OUTPUT", std_handler_output, std_help_output, 0 },
-  { } };
+};


 /**
diff -ru libassuan.orig/Makefile.am libassuan/Makefile.am
--- libassuan.orig/Makefile.am	2016-07-14 10:09:22.000000000 +0200
+++ libassuan/Makefile.am	2017-09-25 21:20:19.928317500 +0200
@@ -35,7 +35,7 @@
 doc =
 endif
 
-SUBDIRS = m4 src $(doc) tests
+SUBDIRS = m4 src $(doc)
 
 
 dist-hook: gen-ChangeLog
