--- a/src/libssh2-1-fixes.patch	Thu Aug 30 11:34:32 2012 +0200
+++ b/src/libssh2-1-fixes.patch	Sun Sep 02 01:06:53 2012 +0200
@@ -1,32 +1,52 @@
 This file is part of MXE.
 See index.html for further information.
 
-From 6b8a3edae23dc93cc02e6c9572d0796e338ddc4f Mon Sep 17 00:00:00 2001
-From: Mark Brand <mabrand@mabrand.nl>
-Date: Sat, 19 May 2012 10:40:36 +0200
-Subject: [PATCH] libgcrypt does not provide pkg-config support
+From 0e2179c67d0cd618be29b30425bda18c23a2ddf0 Mon Sep 17 00:00:00 2001
+From: Dmitry Smirnov <onlyjob@member.fsf.org>
+Date: Mon, 13 Aug 2012 23:34:51 +0200
+Subject: [PATCH 1/2] configure: gcrypt doesn't come with pkg-config support
 
-Commits 04692445d4a32430610ccf8c256e18245cbb3e06
-and e887a8bd0f043fd49e9119756858e75e82dee504 add
-'libgcrypt' to Requires.private of libssh2.pc
-file, but libgcrypt does not provide a .pc file, so
-this does not work.
----
- configure.ac |    1 -
- 1 file changed, 1 deletion(-)
+... so use plain old -lgcrypt to the linker to link with it.
+
+Fixes #225
+(cherry picked from commit e470738a0cf302abfd2891b80dbac4ac3e7eedd2)
 
 diff --git a/configure.ac b/configure.ac
-index aa9d397..0d35a27 100644
+index aa9d397..dfc6988 100644
 --- a/configure.ac
 +++ b/configure.ac
-@@ -102,7 +102,6 @@ fi
+@@ -102,7 +102,7 @@ fi
  # Look for libgcrypt
  if test "$ac_cv_libssl" != "yes" && test "$use_libgcrypt" != "no"; then
    AC_LIB_HAVE_LINKFLAGS([gcrypt], [], [#include <gcrypt.h>])
 -  LIBSREQUIRED=libgcrypt
++  LIBS="$LIBS -lgcrypt"
  fi
  
  AC_SUBST(LIBSREQUIRED)
 -- 
-1.7.9.2
+1.7.10.4
+
+
+From 75ecbf4e5ca3c977418f60db42ba03c13d0e68f9 Mon Sep 17 00:00:00 2001
+From: Mark Brand <mabrand@mabrand.nl>
+Date: Sun, 2 Sep 2012 00:55:28 +0200
+Subject: [PATCH 2/2] include gpg-error with gcrypt for static linking
+ (mxe-specific)
+
 
+diff --git a/configure.ac b/configure.ac
+index dfc6988..748dd21 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -103,6 +103,7 @@ fi
+ if test "$ac_cv_libssl" != "yes" && test "$use_libgcrypt" != "no"; then
+   AC_LIB_HAVE_LINKFLAGS([gcrypt], [], [#include <gcrypt.h>])
+   LIBS="$LIBS -lgcrypt"
++  LIBS="$LIBS `${prefix}/bin/gpg-error-config --libs`"
+ fi
+ 
+ AC_SUBST(LIBSREQUIRED)
+-- 
+1.7.10.4
+

--- a/src/libssh2.mk	Thu Aug 30 11:34:32 2012 +0200
+++ b/src/libssh2.mk	Sun Sep 02 01:06:53 2012 +0200
@@ -24,8 +24,7 @@
         --prefix='$(PREFIX)/$(TARGET)' \
         --without-openssl \
         --with-libgcrypt \
-        PKG_CONFIG='$(TARGET)-pkg-config' \
-        LIBS="-lgcrypt `$(PREFIX)/$(TARGET)/bin/gpg-error-config --libs`"
+        PKG_CONFIG='$(TARGET)-pkg-config'
     $(MAKE) -C '$(1)' -j '$(JOBS)' install bin_PROGRAMS= sbin_PROGRAMS= noinst_PROGRAMS= html_DATA=
 
     '$(TARGET)-gcc' \