diff --git a/autotools/libunistring/libunistring.py b/autotools/libunistring/libunistring.py
new file mode 100644
--- /dev/null
+++ b/autotools/libunistring/libunistring.py
@@ -0,0 +1,27 @@
+# -*- coding: utf-8 -*-
+
+# Copyright (C) 2018 Łukasz Wojniłowicz <lukasz.wojnilowicz@gmail.com>
+
+import info
+from Package.AutoToolsPackageBase import *
+
+
+class subinfo(info.infoclass):
+    def setTargets(self):
+
+        self.targets["0.9.8"] = "https://ftp.gnu.org/gnu/libunistring/libunistring-0.9.8.tar.xz"
+        self.targetDigests["0.9.8"] = (['7b9338cf52706facb2e18587dceda2fbc4a2a3519efa1e15a3f2a68193942f80'], CraftHash.HashAlgorithm.SHA256)
+        self.archiveNames["0.9.8"] = "libunistring-0.9.8.tar.xz"
+        self.targetInstSrc["0.9.8"] = "libunistring-0.9.8"
+
+        self.defaultTarget = "0.9.8"
+
+    def setDependencies(self):
+        self.runtimeDependencies["virtual/base"] = "default"
+        if CraftCore.compiler.isMinGW():
+            self.buildDependencies["dev-util/msys"] = "default"
+
+class Package(AutoToolsPackageBase):
+    def __init__(self, **args):
+        AutoToolsPackageBase.__init__(self)
+        self.subinfo.options.configure.args += " --disable-static --enable-shared "
diff --git a/win32libs/gnutls/0005-fix-strtok-conflict.mingw.patch b/win32libs/gnutls/0005-fix-strtok-conflict.mingw.patch
deleted file mode 100644
--- a/win32libs/gnutls/0005-fix-strtok-conflict.mingw.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- gnutls-3.1.5/gl/m4/strtok_r.m4.orig	2013-05-03 03:34:40 +0400
-+++ gnutls-3.1.5/gl/m4/strtok_r.m4	2013-05-03 04:34:01 +0400
-@@ -13,6 +13,7 @@
-   AC_REQUIRE([gl_HEADER_STRING_H_DEFAULTS])
-   AC_REQUIRE([AC_CANONICAL_HOST]) dnl for cross-compiles
-   AC_CHECK_FUNCS([strtok_r])
-+  ac_cv_func_strtok_r=yes
-   if test $ac_cv_func_strtok_r = yes; then
-     HAVE_STRTOK_R=1
-     dnl glibc 2.7 has a bug in strtok_r that causes a segmentation fault
---- gnutls-3.1.5/lib/verify-tofu.c.orig	2013-05-03 04:35:09 +0400
-+++ gnutls-3.1.5/lib/verify-tofu.c	2013-05-03 05:21:50 +0400
-@@ -34,6 +34,7 @@
- #include <gnutls/abstract.h>
- #include <system.h>
- #include <locks.h>
-+#include <pthread.h>
- 
- struct gnutls_tdb_int {
-   gnutls_tdb_store_func store;
diff --git a/win32libs/gnutls/gnutls.py b/win32libs/gnutls/gnutls.py
--- a/win32libs/gnutls/gnutls.py
+++ b/win32libs/gnutls/gnutls.py
@@ -1,3 +1,5 @@
+# Copyright (C) 2018 Łukasz Wojniłowicz <lukasz.wojnilowicz@gmail.com>
+
 import info
 
 from Package.AutoToolsPackageBase import *
@@ -10,14 +12,15 @@
         for ver in ["3.5.17"]:
             self.targets[ver] = "ftp://ftp.gnutls.org/gcrypt/gnutls/v3.5/gnutls-%s.tar.xz" % ver
             self.targetInstSrc[ver] = "gnutls-%s" % ver
-        # self.patchToApply["3.5.17"] = ("0005-fix-strtok-conflict.mingw.patch", 1)
         self.targetDigests['3.5.17'] = (['86b142afef587c118d63f72ccf307f3321dbc40357aae528202b65d913d20919'], CraftHash.HashAlgorithm.SHA256)
         self.description = "A library which provides a secure layer over a reliable transport layer"
         self.defaultTarget = "3.5.17"
 
     def setDependencies(self):
         self.runtimeDependencies["win32libs/gcrypt"] = "default"
         self.runtimeDependencies["win32libs/nettle"] = "default"
+        self.runtimeDependencies["win32libs/libidn"] = "default"
+        self.runtimeDependencies["autotools/libunistring"] = "default"
         self.runtimeDependencies["autotools/libtasn1"] = "default"
         self.runtimeDependencies["autotools/p11kit"] = "default"
         if CraftCore.compiler.isMinGW():
@@ -27,12 +30,9 @@
 class PackageMinGW(AutoToolsPackageBase):
     def __init__(self, **args):
         AutoToolsPackageBase.__init__(self)
-        self.subinfo.options.configure.args = "--with-zlib --enable-shared --disable-static --enable-cxx --enable-nls --disable-rpath --disable-gtk-doc --disable-guile --disable-libdane --with-included-unistring "
-        self.subinfo.options.configure.cflags = "-I%s/usr/include " % utils.toMSysPath(
-            CraftStandardDirs.msysDir())  # could cause problems but we need the autotools headers
-        self.subinfo.options.configure.ldflags = "-L%s/usr/lib " % utils.toMSysPath(
-            CraftStandardDirs.msysDir())  # could cause problems but we need the autotools libopt
-
+        # 2018-02-11: without --enable-openssl-compatibility xmlmerge.exe from gwenhywfar doesn't display any console output and in effect doesn't allow compilation of aqbanking
+        # 2018-02-11: --enable-nls is probably needed on the same ground as above
+        self.subinfo.options.configure.args = "--enable-shared --disable-static --with-zlib --enable-cxx --enable-nls --disable-gtk-doc --enable-local-libopts --enable-libopts-install --disable-tests --enable-openssl-compatibility "
 
 if CraftCore.compiler.isMinGW():
     class Package(PackageMinGW):