diff --git a/mingw-w64-libssh/PKGBUILD b/mingw-w64-libssh/PKGBUILD
index ebacac83dd..a9359a6d5e 100644
--- a/mingw-w64-libssh/PKGBUILD
+++ b/mingw-w64-libssh/PKGBUILD
@@ -2,7 +2,7 @@
 
 _realname=libssh
 pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}"
-pkgver=0.6.4
+pkgver=0.6.5
 pkgrel=1
 pkgdesc="Library for accessing ssh client services through C libraries (mingw-w64)"
 arch=('any')
@@ -16,20 +16,20 @@ depends=("${MINGW_PACKAGE_PREFIX}-openssl"
          "${MINGW_PACKAGE_PREFIX}-zlib")
 groups=("${MINGW_PACKAGE_PREFIX}")
 options=('staticlibs' 'strip')
-source=(https://red.libssh.org/attachments/download/107/${_realname}-${pkgver}.tar.gz
-        mingw-w64-pthreads.patch
+validpgpkeys=('8DFF53E18F2ABC8D8F3C92237EE0FC4DCC014E3D') # Andreas Schneider <asn@cryptomilk.org>
+source=(https://red.libssh.org/attachments/download/121/${_realname}-${pkgver}.tar.xz
+        https://red.libssh.org/attachments/download/120/${_realname}-${pkgver}.tar.asc
         mingw-as-unix.patch
         mingw-DATADIR-conflict.patch
         fix-threads-libraryname-in-config.patch)
-md5sums=('8a7daa171c69913f475dacffcb639fda'
-         'ca268e1366633f988e21cbcf5a4d8145'
+md5sums=('fdf107011ae1847d86620b39ae37d4f3'
+         'SKIP'
          'd819f18cb4ae07ad2a6589b02765b6c2'
          '7be13e00d27ce77f862012ee0654019b'
          '34899219c2804f81a2218ba13847122b')
 
 prepare() {
   cd ${srcdir}/${_realname}-${pkgver}
-  patch -p1 -i ${srcdir}/mingw-w64-pthreads.patch
   patch -p1 -i ${srcdir}/mingw-as-unix.patch
   patch -p1 -i ${srcdir}/mingw-DATADIR-conflict.patch
   patch -p1 -i ${srcdir}/fix-threads-libraryname-in-config.patch
@@ -45,6 +45,7 @@ build() {
     -DCMAKE_BUILD_TYPE=Release \
     -DWITH_STATIC_LIB=ON \
     ../${_realname}-${pkgver}
+
   make all
 }
 
@@ -52,9 +53,7 @@ package() {
   cd "${srcdir}/build-${MINGW_CHOST}"
   make install
 
-  pushd ${pkgdir}${MINGW_PREFIX} > /dev/null
-  export PREFIX_WIN=`pwd -W`
-  popd > /dev/null
+  local PREFIX_WIN=$(cygpath -wm ${pkgdir}${MINGW_PREFIX})
   sed -e "s|${PREFIX_WIN}|${MINGW_PREFIX}|g" \
     -i ${pkgdir}${MINGW_PREFIX}/lib/pkgconfig/libssh.pc \
     -i ${pkgdir}${MINGW_PREFIX}/lib/pkgconfig/libssh_threads.pc \
diff --git a/mingw-w64-libssh/mingw-w64-pthreads.patch b/mingw-w64-libssh/mingw-w64-pthreads.patch
deleted file mode 100644
index 36c60451b3..0000000000
--- a/mingw-w64-libssh/mingw-w64-pthreads.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- libssh-0.6.3/src/threads/pthread.c.orig	2014-03-16 23:41:28.498600000 +0400
-+++ libssh-0.6.3/src/threads/pthread.c	2014-03-16 23:41:53.318200000 +0400
-@@ -75,7 +75,7 @@
- }
- 
- static unsigned long ssh_pthread_thread_id (void){
--#if _WIN32
-+#if defined(_WIN32) && !defined(__MINGW32__)
-     return (unsigned long) pthread_self().p;
- #else
-     return (unsigned long) pthread_self();