diff --git a/libs/_autotools/gpg-error/gpg-error-1.31-20191119.diff b/libs/_autotools/gpg-error/gpg-error-1.31-20191119.diff
new file mode 100644
index 00000000..ef5b14bc
--- /dev/null
+++ b/libs/_autotools/gpg-error/gpg-error-1.31-20191119.diff
@@ -0,0 +1,120 @@
+diff -Nrub -x '*~' -x '*\.rej' -x '*\.orig' -x '*\.o' -x '*\.pyc' libgpg-error-1.31.orig/lang/cl/mkerrcodes.awk libgpg-error-1.31/lang/cl/mkerrcodes.awk
+--- libgpg-error-1.31.orig/lang/cl/mkerrcodes.awk	2013-03-15 20:24:25.000000000 +0100
++++ libgpg-error-1.31/lang/cl/mkerrcodes.awk	2019-11-19 22:26:58.393237700 +0100
+@@ -122,7 +122,7 @@
+ }
+ 
+ !header {
+-  sub (/\#.+/, "");
++  sub (/#.+/, "");
+   sub (/[ 	]+$/, ""); # Strip trailing space and tab characters.
+ 
+   if (/^$/)
+diff -Nrub -x '*~' -x '*\.rej' -x '*\.orig' -x '*\.o' -x '*\.pyc' libgpg-error-1.31.orig/src/Makefile.am libgpg-error-1.31/src/Makefile.am
+--- libgpg-error-1.31.orig/src/Makefile.am	2018-03-22 17:43:22.000000000 +0100
++++ libgpg-error-1.31/src/Makefile.am	2019-11-19 22:28:19.412719100 +0100
+@@ -281,7 +281,7 @@
+ 
+ errnos-sym.h: Makefile mkstrtable.awk errnos.in
+ 	$(AWK) -f $(srcdir)/mkstrtable.awk -v textidx=2 -v nogettext=1 \
+-		-v prefix=GPG_ERR_ -v namespace=errnos_ \
++		-v prefix=GPG_ERR_ -v pkg_namespace=errnos_ \
+ 		$(srcdir)/errnos.in >$@
+ 
+ 
+diff -Nrub -x '*~' -x '*\.rej' -x '*\.orig' -x '*\.o' -x '*\.pyc' libgpg-error-1.31.orig/src/mkerrcodes.awk libgpg-error-1.31/src/mkerrcodes.awk
+--- libgpg-error-1.31.orig/src/mkerrcodes.awk	2013-03-15 20:24:25.000000000 +0100
++++ libgpg-error-1.31/src/mkerrcodes.awk	2019-11-19 22:26:58.400236600 +0100
+@@ -85,7 +85,7 @@
+ }
+ 
+ !header {
+-  sub (/\#.+/, "");
++  sub (/#.+/, "");
+   sub (/[ 	]+$/, ""); # Strip trailing space and tab characters.
+ 
+   if (/^$/)
+diff -Nrub -x '*~' -x '*\.rej' -x '*\.orig' -x '*\.o' -x '*\.pyc' libgpg-error-1.31.orig/src/mkerrcodes1.awk libgpg-error-1.31/src/mkerrcodes1.awk
+--- libgpg-error-1.31.orig/src/mkerrcodes1.awk	2013-03-15 20:24:25.000000000 +0100
++++ libgpg-error-1.31/src/mkerrcodes1.awk	2019-11-19 22:26:58.402239100 +0100
+@@ -81,7 +81,7 @@
+ }
+ 
+ !header {
+-  sub (/\#.+/, "");
++  sub (/#.+/, "");
+   sub (/[ 	]+$/, ""); # Strip trailing space and tab characters.
+ 
+   if (/^$/)
+diff -Nrub -x '*~' -x '*\.rej' -x '*\.orig' -x '*\.o' -x '*\.pyc' libgpg-error-1.31.orig/src/mkerrcodes2.awk libgpg-error-1.31/src/mkerrcodes2.awk
+--- libgpg-error-1.31.orig/src/mkerrcodes2.awk	2013-03-15 20:24:25.000000000 +0100
++++ libgpg-error-1.31/src/mkerrcodes2.awk	2019-11-19 22:26:58.404249900 +0100
+@@ -91,7 +91,7 @@
+ }
+ 
+ !header {
+-  sub (/\#.+/, "");
++  sub (/#.+/, "");
+   sub (/[ 	]+$/, ""); # Strip trailing space and tab characters.
+ 
+   if (/^$/)
+diff -Nrub -x '*~' -x '*\.rej' -x '*\.orig' -x '*\.o' -x '*\.pyc' libgpg-error-1.31.orig/src/mkerrnos.awk libgpg-error-1.31/src/mkerrnos.awk
+--- libgpg-error-1.31.orig/src/mkerrnos.awk	2013-03-15 20:24:25.000000000 +0100
++++ libgpg-error-1.31/src/mkerrnos.awk	2019-11-19 22:26:58.406237500 +0100
+@@ -83,7 +83,7 @@
+ }
+ 
+ !header {
+-  sub (/\#.+/, "");
++  sub (/#.+/, "");
+   sub (/[ 	]+$/, ""); # Strip trailing space and tab characters.
+ 
+   if (/^$/)
+diff -Nrub -x '*~' -x '*\.rej' -x '*\.orig' -x '*\.o' -x '*\.pyc' libgpg-error-1.31.orig/src/mkstrtable.awk libgpg-error-1.31/src/mkstrtable.awk
+--- libgpg-error-1.31.orig/src/mkstrtable.awk	2013-03-15 20:24:25.000000000 +0100
++++ libgpg-error-1.31/src/mkstrtable.awk	2019-11-19 22:26:58.408245500 +0100
+@@ -77,7 +77,7 @@
+ #
+ # The variable prefix can be used to prepend a string to each message.
+ #
+-# The variable namespace can be used to prepend a string to each
++# The variable pkg_namespace can be used to prepend a string to each
+ # variable and macro name.
+ 
+ BEGIN {
+@@ -102,7 +102,7 @@
+       print "/* The purpose of this complex string table is to produce";
+       print "   optimal code with a minimum of relocations.  */";
+       print "";
+-      print "static const char " namespace "msgstr[] = ";
++      print "static const char " pkg_namespace "msgstr[] = ";
+       header = 0;
+     }
+   else
+@@ -110,7 +110,7 @@
+ }
+ 
+ !header {
+-  sub (/\#.+/, "");
++  sub (/#.+/, "");
+   sub (/[ 	]+$/, ""); # Strip trailing space and tab characters.
+ 
+   if (/^$/)
+@@ -150,7 +150,7 @@
+   else
+     print "  gettext_noop (\"" last_msgstr "\");";
+   print "";
+-  print "static const int " namespace "msgidx[] =";
++  print "static const int " pkg_namespace "msgidx[] =";
+   print "  {";
+   for (i = 0; i < coded_msgs; i++)
+     print "    " pos[i] ",";
+@@ -158,7 +158,7 @@
+   print "  };";
+   print "";
+   print "static GPG_ERR_INLINE int";
+-  print namespace "msgidxof (int code)";
++  print pkg_namespace "msgidxof (int code)";
+   print "{";
+   print "  return (0 ? 0";
+ 
diff --git a/libs/_autotools/gpg-error/gpg-error.py b/libs/_autotools/gpg-error/gpg-error.py
index a02a2878..83d2fa11 100644
--- a/libs/_autotools/gpg-error/gpg-error.py
+++ b/libs/_autotools/gpg-error/gpg-error.py
@@ -1,33 +1,35 @@
 import info
 
 
 class subinfo(info.infoclass):
     def setTargets( self ):
-        for ver in ["1.27", "1.31"]:
+        for ver in ["1.27", "1.31", "1.36"]:
             self.targets[ver] = f"https://www.gnupg.org/ftp/gcrypt/libgpg-error/libgpg-error-{ver}.tar.bz2"
             self.targetInstSrc[ver] = f"libgpg-error-{ver}"
-        self.patchToApply["1.31"] = [("libgpg-error-1.31.diff", 1)]
+        self.patchToApply["1.31"] = [("libgpg-error-1.31.diff", 1),
+                                     ("gpg-error-1.31-20191119.diff", 1)]  # https://dev.gnupg.org/rE7865041c77f4f7005282f10f9b6666b19072fbdf
         self.targetDigests['1.27'] = (['4f93aac6fecb7da2b92871bb9ee33032be6a87b174f54abf8ddf0911a22d29d2'], CraftHash.HashAlgorithm.SHA256)
-        self.targetDigests['1.31'] =  (['40d0a823c9329478063903192a1f82496083b277265904878f4bc09e0db7a4ef'], CraftHash.HashAlgorithm.SHA256)
+        self.targetDigests['1.31'] = (['40d0a823c9329478063903192a1f82496083b277265904878f4bc09e0db7a4ef'], CraftHash.HashAlgorithm.SHA256)
+        self.targetDigests['1.36'] = (['babd98437208c163175c29453f8681094bcaf92968a15cafb1a276076b33c97c'], CraftHash.HashAlgorithm.SHA256)
         self.description = "Small library with error codes and descriptions shared by most GnuPG related software"
         self.patchLevel["1.31"] = 2
         self.defaultTarget = "1.31"
 
     def setDependencies( self ):
         self.buildDependencies["dev-utils/msys"] = None
         self.runtimeDependencies["libs/iconv"] = None
         self.runtimeDependencies["virtual/base"] = None
 
 from Package.AutoToolsPackageBase import *
 
 class Package(AutoToolsPackageBase):
     def __init__( self, **args ):
         AutoToolsPackageBase.__init__( self )
         self.subinfo.options.configure.bootstrap = True
         self.subinfo.options.configure.args += " --disable-static --enable-shared "
 
     def postInstall( self ):
         return (self.patchInstallPrefix([os.path.join(self.installDir(), "bin", "gpg-error-config"),
                                          os.path.join(self.installDir(), "bin", "gpgrt-config")],
                         OsUtils.toMSysPath(self.subinfo.buildPrefix),
                         OsUtils.toMSysPath(CraftCore.standardDirs.craftRoot())))