diff --git a/libraries/libssh2/libssh2.SlackBuild b/libraries/libssh2/libssh2.SlackBuild
index 9b2eef4c72..ee41625243 100644
--- a/libraries/libssh2/libssh2.SlackBuild
+++ b/libraries/libssh2/libssh2.SlackBuild
@@ -9,7 +9,7 @@
 # http://sam.zoy.org/wtfpl/COPYING for more details.
 
 PRGNAM=libssh2
-VERSION=${VERSION:-0.18}
+VERSION=${VERSION:-1.2.2}
 ARCH=${ARCH:-i486}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
@@ -21,10 +21,13 @@ OUTPUT=${OUTPUT:-/tmp}	# Drop the package in /tmp
 
 if [ "$ARCH" = "i486" ]; then
   SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+  LIBDIRSUFFIX=""
 elif [ "$ARCH" = "i686" ]; then
   SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+  LIBDIRSUFFIX=""
 elif [ "$ARCH" = "x86_64" ]; then
   SLKCFLAGS="-O2 -fPIC"
+  LIBDIRSUFFIX="64"
 fi
 
 set -e # Exit on most errors
@@ -46,12 +49,13 @@ CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
 ./configure \
   --prefix=/usr \
+  --libdir=/usr/lib${LIBDIRSUFFIX} \
   --sysconfdir=/etc \
   --localstatedir=/var \
   --mandir=/usr/man
 
 make
-make install DESTDIR=$PKG
+make install-strip DESTDIR=$PKG
 
 find $PKG -type f | xargs file | grep -e "executable" -e "shared object" \
   | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null
@@ -70,4 +74,4 @@ mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.tgz
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/libraries/libssh2/libssh2.info b/libraries/libssh2/libssh2.info
index bc4971da82..0420909800 100644
--- a/libraries/libssh2/libssh2.info
+++ b/libraries/libssh2/libssh2.info
@@ -1,8 +1,10 @@
 PRGNAM="libssh2"
-VERSION="0.18"
+VERSION="1.2.2"
 HOMEPAGE="http://www.libssh2.org/"
-DOWNLOAD="http://prdownloads.sourceforge.net/libssh2/libssh2-0.18.tar.gz"
-MD5SUM="5b9c83660aa4d1821ff2c05838e77e9d"
+DOWNLOAD="http://www.libssh2.org/download/libssh2-1.2.2.tar.gz"
+DOWNLOAD_x86_64=""
+MD5SUM="fa8d9cd425bdd62f57244fc61fb54da7"
+MD5SUM_x86_64=""
 MAINTAINER="Menno Duursma"
 EMAIL="druiloor@zonnet.nl"
 APPROVED="dsomero"
diff --git a/libraries/libssh2/slack-desc b/libraries/libssh2/slack-desc
index 2f2e5bd462..948cc1d0bf 100644
--- a/libraries/libssh2/slack-desc
+++ b/libraries/libssh2/slack-desc
@@ -9,6 +9,7 @@
 libssh2: Libssh2 (SECSH network protocol library)
 libssh2:
 libssh2: libssh2 is a library implementing the SSH2 protocol.
+libssh2:
 libssh2: Sara Golemon is the libssh2 project manager at sourceforge.net
 libssh2:
 libssh2:
@@ -16,4 +17,3 @@ libssh2:
 libssh2:
 libssh2:
 libssh2:
-libssh2: