diff --git security/libssh/Makefile security/libssh/Makefile
index 6de0ceb41477..6144c97895a2 100644
--- security/libssh/Makefile
+++ security/libssh/Makefile
@@ -2,9 +2,9 @@
 # $FreeBSD$
 
 PORTNAME=	libssh
-DISTVERSION=	0.8.6
+DISTVERSION=	0.9.2
 CATEGORIES=	security devel
-MASTER_SITES=	https://www.libssh.org/files/0.8/
+MASTER_SITES=	https://www.libssh.org/files/0.9/
 
 MAINTAINER=	phascolarctos@protonmail.ch
 COMMENT=	Library implementing the SSH2 protocol
@@ -15,31 +15,34 @@ LICENSE_FILE=	${WRKSRC}/COPYING
 USES=		cmake cpe tar:xz
 USE_LDCONFIG=	yes
 
-CMAKE_ARGS=	-DWITH_EXAMPLES:BOOL=OFF \
-		-DWITH_TESTING:BOOL=OFF \
-		-DWITH_ZLIB:BOOL=ON
+CMAKE_ARGS=	-DWITH_EXAMPLES:BOOL=OFF
 
-OPTIONS_DEFINE=	GSSAPI STATIC
+OPTIONS_DEFINE=	GSSAPI STATIC ZLIB
 OPTIONS_RADIO=	CRYPTO
 OPTIONS_RADIO_CRYPTO=	GCRYPT OPENSSL
-OPTIONS_DEFAULT=	GSSAPI OPENSSL STATIC
+OPTIONS_DEFAULT=	GSSAPI OPENSSL STATIC ZLIB
 OPTIONS_SUB=	yes
 
-GCRYPT_LIB_DEPENDS=	libgcrypt.so:security/libgcrypt
+GCRYPT_LIB_DEPENDS=	libgcrypt.so:security/libgcrypt \
+			libgpg-error.so:security/libgpg-error
 GCRYPT_CMAKE_BOOL=	WITH_GCRYPT
 GSSAPI_CMAKE_BOOL=	WITH_GSSAPI
 OPENSSL_USES=		ssl
-STATIC_CMAKE_BOOL=	WITH_STATIC_LIB
+STATIC_CMAKE_BOOL=	BUILD_STATIC_LIB
+ZLIB_CMAKE_BOOL=	WITH_ZLIB
+
+.include <bsd.port.pre.mk>
 
 post-patch:
 	${RM} ${PATCH_WRKSRC}/cmake/Modules/UseDoxygen.cmake
+.if ${LOCALBASE} != "/usr/local"
 	${REINPLACE_CMD} \
 		-e 's|LIB_INSTALL_DIR}|CMAKE_INSTALL_PREFIX}/libdata|' \
 		-e 's|CMAKE_INSTALL_DIR}|CMAKE_INSTALL_DIR}/libssh|' \
 		${WRKSRC}/CMakeLists.txt
-#	${REINPLACE_CMD} -e 's|-lssh_threads|-lssh_threads -lpthread|' \
-#		${WRKSRC}/libssh_threads.pc.cmake
-	${REINPLACE_CMD} -e 's| -pedantic-errors||' \
-		${WRKSRC}/cmake/Modules/DefineCompilerFlags.cmake
+.endif
+
+post-install-STATIC-on:
+	${INSTALL_DATA} ${CONFIGURE_WRKSRC}/src/libssh.a ${STAGEDIR}${PREFIX}/lib/
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff --git security/libssh/distinfo security/libssh/distinfo
index 3b41493c4bdc..c69e29aa1e03 100644
--- security/libssh/distinfo
+++ security/libssh/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1548450366
-SHA256 (libssh-0.8.6.tar.xz) = 1046b95632a07fc00b1ea70ee683072d0c8a23f544f4535440b727812002fd01
-SIZE (libssh-0.8.6.tar.xz) = 433680
+TIMESTAMP = 1573566147
+SHA256 (libssh-0.9.2.tar.xz) = 1970a8991374fc8cbdcb7fcc3683fe8f8824aa37d575f38cfb75fe0fe50fd9ad
+SIZE (libssh-0.9.2.tar.xz) = 495876
diff --git security/libssh/pkg-plist security/libssh/pkg-plist
index 8fdbb76ece3d..92fc0dfe3430 100644
--- security/libssh/pkg-plist
+++ security/libssh/pkg-plist
@@ -5,10 +5,11 @@ include/libssh/libsshpp.hpp
 include/libssh/server.h
 include/libssh/sftp.h
 include/libssh/ssh2.h
-lib/cmake/libssh/libssh/libssh-config.cmake
-lib/cmake/libssh/libssh/libssh-config-version.cmake
+lib/cmake/libssh/libssh-config-%%CMAKE_BUILD_TYPE%%.cmake
+lib/cmake/libssh/libssh-config.cmake
+lib/cmake/libssh/libssh-config-version.cmake
 %%STATIC%%lib/libssh.a
 lib/libssh.so
 lib/libssh.so.4
-lib/libssh.so.4.7.3
+lib/libssh.so.4.8.3
 libdata/pkgconfig/libssh.pc