diff --git a/packages/network/libssh/package.mk b/packages/network/libssh/package.mk
index 7bb83b931c..c984625b5d 100644
--- a/packages/network/libssh/package.mk
+++ b/packages/network/libssh/package.mk
@@ -1,16 +1,20 @@
 # SPDX-License-Identifier: GPL-2.0-or-later
 # Copyright (C) 2009-2016 Stephan Raue (stephan@openelec.tv)
+# Copyright (C) 2018-present Team LibreELEC (https://libreelec.tv)
 
 PKG_NAME="libssh"
-PKG_VERSION="0.8.1"
-PKG_SHA256="d17f1267b4a5e46c0fbe66d39a3e702b8cefe788928f2eb6e339a18bb00b1924"
+PKG_VERSION="0.8.4"
+PKG_SHA256="6bb07713021a8586ba2120b2c36c468dc9ac8096d043f9b1726639aa4275b81b"
 PKG_LICENSE="LGPL"
 PKG_SITE="http://www.libssh.org/"
-PKG_URL="https://www.libssh.org/files/0.8/$PKG_NAME-$PKG_VERSION.tar.xz"
+PKG_URL="https://www.libssh.org/files/${PKG_VERSION%.*}/$PKG_NAME-$PKG_VERSION.tar.xz"
 PKG_DEPENDS_TARGET="toolchain zlib openssl"
-PKG_LONGDESC="A working SSH implementation by means of a library."
+PKG_LONGDESC="Library for accessing ssh client services through C libraries."
 
-PKG_CMAKE_OPTS_TARGET="-DWITH_STATIC_LIB=1 -DWITH_SERVER=OFF -DWITH_GCRYPT=OFF -DWITH_GSSAPI=OFF"
+PKG_CMAKE_OPTS_TARGET="-DWITH_STATIC_LIB=1 \
+                       -DWITH_SERVER=OFF \
+                       -DWITH_GCRYPT=OFF \
+                       -DWITH_GSSAPI=OFF"
 
 makeinstall_target() {
 # install static library only
diff --git a/packages/network/libssh/patches/libssh-gcc-5-fix.patch b/packages/network/libssh/patches/libssh-gcc-5-fix.patch
deleted file mode 100644
index ba1965ff2b..0000000000
--- a/packages/network/libssh/patches/libssh-gcc-5-fix.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -Naur libssh-0.6.4/cmake/Modules/DefineCompilerFlags.cmake libssh-0.6.4.patch/cmake/Modules/DefineCompilerFlags.cmake
---- libssh-0.6.4/cmake/Modules/DefineCompilerFlags.cmake	2014-09-15 20:54:34.000000000 +0200
-+++ libssh-0.6.4.patch/cmake/Modules/DefineCompilerFlags.cmake	2015-04-08 09:43:51.643578533 +0200
-@@ -10,7 +10,7 @@
-     if (${CMAKE_C_COMPILER_ID} MATCHES "(GNU|Clang)")
- 
-         # add -Wconversion ?
--        set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -std=gnu99 -pedantic -pedantic-errors")
-+        set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -std=gnu99 -pedantic")
-         set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall -Wextra -Wshadow -Wmissing-prototypes -Wdeclaration-after-statement")
-         set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wunused -Wfloat-equal -Wpointer-arith -Wwrite-strings -Wformat-security")
-         set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wmissing-format-attribute")