diff --git a/vlc-libssh2-ECDSA-version.patch b/vlc-libssh2-ECDSA-version.patch
new file mode 100644
index 0000000..219f1f0
--- /dev/null
+++ b/vlc-libssh2-ECDSA-version.patch
@@ -0,0 +1,28 @@
+From 11449b5cd8b415768e010d9b7c1d6ba3cea21f82 Mon Sep 17 00:00:00 2001
+From: =?utf8?q?R=C3=A9mi=20Denis-Courmont?= <remi@remlab.net>
+Date: Wed, 20 Mar 2019 05:20:30 +0200
+Subject: [PATCH] sftp: fix version for ECDSA known hosts (fixes #22060)
+
+1.8.x is a stable branch, separate from the feature branch that contains
+the ECDSA support.
+---
+ modules/access/sftp.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/modules/access/sftp.c b/modules/access/sftp.c
+index e420b91ca9..dc7f6cc27f 100644
+--- a/modules/access/sftp.c
++++ b/modules/access/sftp.c
+@@ -307,7 +307,7 @@ static int Open( vlc_object_t* p_this )
+         case LIBSSH2_HOSTKEY_TYPE_DSS:
+             knownhost_fingerprint_algo = LIBSSH2_KNOWNHOST_KEY_SSHDSS;
+             break;
+-#if LIBSSH2_VERSION_NUM >= 0x010801
++#if LIBSSH2_VERSION_NUM >= 0x010900
+         case LIBSSH2_HOSTKEY_TYPE_ECDSA_256:
+             knownhost_fingerprint_algo = LIBSSH2_KNOWNHOST_KEY_ECDSA_256;
+             break;
+-- 
+2.11.0
+
+
diff --git a/vlc.changes b/vlc.changes
index 611f3ca..85bdbff 100644
--- a/vlc.changes
+++ b/vlc.changes
@@ -1,3 +1,15 @@
+-------------------------------------------------------------------
+Wed Mar 20 11:05:26 UTC 2019 - Dominique Leuenberger <dimstar@opensuse.org>
+
+- Add vlc-libssh2-ECDSA-version.patch: sftp: fix version for ECDSA
+  known hosts (fixes vlc#22060).
+
+-------------------------------------------------------------------
+Sat Mar 16 20:08:28 UTC 2019 - Bjørn Lie <bjorn.lie@gmail.com>
+
+- Add conditional pkgconfig(dav1d) BuildRequires: build av1
+  decoding via dav1d decoder.
+
 -------------------------------------------------------------------
 Tue Mar  5 08:07:41 UTC 2019 - Dominique Leuenberger <dimstar@opensuse.org>
 
diff --git a/vlc.spec b/vlc.spec
index f075c18..9c6db2f 100644
--- a/vlc.spec
+++ b/vlc.spec
@@ -57,6 +57,8 @@ Patch101:       0001-Fix-leaking-AvahiServiceResolver-in-the-error-paths.patch
 Patch102:       0002-Add-Avahi-implementation-for-chromecast-renderer-dis.patch
 # PATCH-FIX-UPSTREAM 0001-codec-vpx-Detect-libvpx-1.8.0.patch -- Fix building vlc with libvpx 1.8.0
 Patch103:       0001-codec-vpx-Detect-libvpx-1.8.0.patch
+# PATCH-FIX-UPSTREAM vlc-libssh2-ECDSA-version.patch dimstar@opensuse.org -- sftp: fix version for ECDSA known hosts (fixes #22060)
+Patch104:       vlc-libssh2-ECDSA-version.patch
 BuildRequires:  Mesa-devel
 BuildRequires:  SDL-devel >= 1.2.10
 BuildRequires:  aalib-devel
@@ -167,6 +169,9 @@ Requires:       %{name}-qt = %{version}-%{release}
 PreReq:         %{name}-noX
 Conflicts:      %{conflicts}
 Obsoletes:      %{name}-gnome <= %{version}
+%if 0%{?suse_version} >= 1550
+BuildRequires:  pkgconfig(dav1d)
+%endif
 %if 0%{?suse_version} > 1500 && 0%{?is_opensuse}
 BuildRequires:  pkgconfig(srt)
 %endif
@@ -378,6 +383,7 @@ default when `vlc` is invoked from an X session.
 %patch101 -p1
 %patch102 -p1
 %patch103 -p1
+%patch104 -p1
 
 ### And LUA 5.3.1 has some more API changes
 if pkg-config --atleast-version 5.3.1 lua; then
@@ -812,6 +818,9 @@ done
 %{_libdir}/vlc/plugins/codec/libcc_plugin.so
 %{_libdir}/vlc/plugins/codec/libcdg_plugin.so
 %{_libdir}/vlc/plugins/codec/libcvdsub_plugin.so
+%if 0%{?suse_version} >= 1550
+%{_libdir}/vlc/plugins/codec/libdav1d_plugin.so
+%endif
 %{_libdir}/vlc/plugins/codec/libddummy_plugin.so
 %{_libdir}/vlc/plugins/codec/libdvbsub_plugin.so
 %{_libdir}/vlc/plugins/codec/libedummy_plugin.so