diff --git a/0001-disable-timeout-test-on-slow-buildsystems.patch b/0001-disable-timeout-test-on-slow-buildsystems.patch
index e9fe17e..70d83bd 100644
--- a/0001-disable-timeout-test-on-slow-buildsystems.patch
+++ b/0001-disable-timeout-test-on-slow-buildsystems.patch
@@ -1,11 +1,11 @@
-Index: libssh-0.9.0/tests/unittests/torture_misc.c
+Index: libssh-0.9.6/tests/unittests/torture_misc.c
 ===================================================================
---- libssh-0.9.0.orig/tests/unittests/torture_misc.c	2019-06-28 08:45:32.418434037 +0200
-+++ libssh-0.9.0/tests/unittests/torture_misc.c	2019-06-28 08:45:38.766497056 +0200
-@@ -197,11 +197,13 @@ static void torture_timeout_elapsed(void
-     (void) state;
+--- libssh-0.9.6.orig/tests/unittests/torture_misc.c	2021-08-26 15:14:47.337264821 +0200
++++ libssh-0.9.6/tests/unittests/torture_misc.c	2021-08-26 15:15:24.513466534 +0200
+@@ -211,11 +211,13 @@ static void torture_timeout_elapsed(void
      ssh_timestamp_init(&ts);
-     usleep(50000);
+     usleep(30000);
+ 
 +#ifndef SLOW_TEST_SYSTEM
      assert_true(ssh_timeout_elapsed(&ts,25));
      assert_false(ssh_timeout_elapsed(&ts,30000));
@@ -16,7 +16,7 @@ Index: libssh-0.9.0/tests/unittests/torture_misc.c
  }
  
  static void torture_timeout_update(void **state){
-@@ -209,11 +211,13 @@ static void torture_timeout_update(void
+@@ -223,11 +225,13 @@ static void torture_timeout_update(void
      (void) state;
      ssh_timestamp_init(&ts);
      usleep(50000);
@@ -30,10 +30,10 @@ Index: libssh-0.9.0/tests/unittests/torture_misc.c
  }
  
  static void torture_ssh_analyze_banner(void **state) {
-Index: libssh-0.9.0/DefineOptions.cmake
+Index: libssh-0.9.6/DefineOptions.cmake
 ===================================================================
---- libssh-0.9.0.orig/DefineOptions.cmake	2019-06-28 08:45:32.418434037 +0200
-+++ libssh-0.9.0/DefineOptions.cmake	2019-06-28 08:46:08.330789588 +0200
+--- libssh-0.9.6.orig/DefineOptions.cmake	2021-08-26 15:14:47.337264821 +0200
++++ libssh-0.9.6/DefineOptions.cmake	2021-08-26 15:14:50.093279775 +0200
 @@ -22,6 +22,7 @@ option(WITH_ABI_BREAK "Allow ABI break"
  option(WITH_GEX "Enable DH Group exchange mechanisms" ON)
  option(FUZZ_TESTING "Build with fuzzer for the server" OFF)
@@ -42,7 +42,7 @@ Index: libssh-0.9.0/DefineOptions.cmake
  
  if (WITH_ZLIB)
      set(WITH_LIBZ ON)
-@@ -57,3 +58,8 @@ endif (NOT GLOBAL_BIND_CONFIG)
+@@ -53,3 +54,8 @@ endif (NOT GLOBAL_BIND_CONFIG)
  if (NOT GLOBAL_CLIENT_CONFIG)
    set(GLOBAL_CLIENT_CONFIG "/etc/ssh/ssh_config")
  endif (NOT GLOBAL_CLIENT_CONFIG)
diff --git a/libssh-0.9.5.tar.xz b/libssh-0.9.5.tar.xz
deleted file mode 100644
index d86dfd1..0000000
--- a/libssh-0.9.5.tar.xz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:acffef2da98e761fc1fd9c4fddde0f3af60ab44c4f5af05cd1b2d60a3fa08718
-size 502876
diff --git a/libssh-0.9.5.tar.xz.asc b/libssh-0.9.5.tar.xz.asc
deleted file mode 100644
index 8bda5c9..0000000
--- a/libssh-0.9.5.tar.xz.asc
+++ /dev/null
@@ -1,16 +0,0 @@
------BEGIN PGP SIGNATURE-----
-
-iQIzBAABCgAdFiEEjf9T4Y8qvI2PPJIjfuD8TcwBTj0FAl9aH9kACgkQfuD8TcwB
-Tj35ZA/9G7lNf/byK3cJeXKb8Lp2oZ3iiAral4uT/cylnXnEa7dOoTjwV5MYvQqm
-BDYFta7wsGBEWLOLrtyDJr4+krh9TSs53UVwieRTd0Z87MlcTb+a0gtiJa3Y5Gdv
-QNge9rnUGr1MdTwvpPcSvQmoa7iH9HGzC2KrOCCyihUWX9kB+DNKWeSGJAZLNIJv
-C3DvB8N0di/X5f74loRsAkwA6DAfiRtd8QyuqY7NeP3ZK/cEG5R/4WpCmCHCriBI
-oBamKQT2CmNkHGCxMhN5iQFcm3D92lKdTLrMP+v0HlZnIjkzVJVBJeqn7FkWT967
-JvGqDGEiNozH4eGGjQn5SyHaVCQIv5S815L2mEKG+p0F8BvW6fQs34/RA5np3J2s
-SPSFhzKuORePQzoVzF8/Jsf7cTTuzgaSFKi2dkbgkqe39DnKOWhT0K6QVGfNbajz
-C/a9GVRl7t6Q/kNR6dFAqc++7civlfQf2Dav1NfEobJxR+DpO5CPXBCuauTXgP8Y
-gbvQjfBqk2Gl4VOfCObtEfLiHPNeLI/QpKq9+KAtQlWFawCOhIZsBH/p2ynDI+XJ
-wxfLiXPkfeNuQUUuP126mkG9GxbsHGLY38p4WKEQQ3zVx1Pxilq77ZhKGMmTgnvA
-/ArOwn3wNwgoP6OQdsy1hxTk16TZ+pRttJyhrdebEX7DnxAgPyw=
-=eqzl
------END PGP SIGNATURE-----
diff --git a/libssh-0.9.6.tar.xz b/libssh-0.9.6.tar.xz
new file mode 100644
index 0000000..796bc28
--- /dev/null
+++ b/libssh-0.9.6.tar.xz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:86bcf885bd9b80466fe0e05453c58b877df61afa8ba947a58c356d7f0fab829b
+size 1053056
diff --git a/libssh-0.9.6.tar.xz.asc b/libssh-0.9.6.tar.xz.asc
new file mode 100644
index 0000000..e5b636e
--- /dev/null
+++ b/libssh-0.9.6.tar.xz.asc
@@ -0,0 +1,16 @@
+-----BEGIN PGP SIGNATURE-----
+
+iQIzBAABCgAdFiEEjf9T4Y8qvI2PPJIjfuD8TcwBTj0FAmEniOkACgkQfuD8TcwB
+Tj0TKQ/9HiMAGSMHoQ+iPVLP06iTc6Cy7rNyON2nPDQwAz0V/dfvkrKAAEflfgYd
+3pt3dbE/qgh2kgQLb9kpbCUmFoGuLgKz36RPOsggwuOsN+eD1n65q8W39sMOQid3
+bjUIOKRdYWC1suZ9fMAO1Ignl69Opd8dAq1Has9YzglaeQaV/lnYQOW4UG0xKHck
+ZOp2qLfjmaQiBAI61eRyxqIYC0F67WKd0bo9D2csoocDVvHLq4syPdbMOfDTB+LL
+KZSAZVW1R1JUVZMkp/P/HU11jNNy3wKoLafocnq8bXkPVrqhyuo+hDJV/OPUvFLa
+VE/BzIRoMNG+1R+GJpwE7ut2DIHPxnZTThRkeVN5qP1+hbhgLJhW62I+HeAnD4s+
++W7fwJovN28I+wqSjVEP8JguprVuoDAX5jVHbeZoMT7p8ATA4Nh3KCbYELEwTtFG
+zsEIlBvoNXD3ce7xGXL3MPqfgKqrZQjRG/iOWvKwDV7WrqK1cFFyL7aeBfK2+dQq
+1Ew7aYlTsH6Hap7XByeSsy4Z5ts3VXIoFix/h+Br5OTYKYgITM7bijNAQ6A2ZWQN
+TxCv8X0sVyaGyXhxG6QhrEWZjFe496MneZkq9e6HKZyaSbzwFwMgOvrUUC7fa8e5
+o1Rvozah81U0nsikwTmDrm15RSK3mr2X34zPW2Ahzr1I5tGZzOk=
+=cO0k
+-----END PGP SIGNATURE-----
diff --git a/libssh.changes b/libssh.changes
index 90257d9..ae8508f 100644
--- a/libssh.changes
+++ b/libssh.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Thu Aug 26 13:15:59 UTC 2021 - Andreas Schneider <asn@cryptomilk.org>
+
+- Update to version 0.9.6 (bsc#1189608, CVE-2021-3634)
+  * https://git.libssh.org/projects/libssh.git/tag/?h=libssh-0.9.6
+
 -------------------------------------------------------------------
 Mon Sep 21 19:16:06 UTC 2020 - Andreas Schneider <asn@cryptomilk.org>
 
diff --git a/libssh.spec b/libssh.spec
index f63133f..7729d64 100644
--- a/libssh.spec
+++ b/libssh.spec
@@ -1,7 +1,7 @@
 #
-# spec file for package libssh
+# spec file
 #
-# Copyright (c) 2020 SUSE LLC
+# Copyright (c) 2021 SUSE LLC
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -30,7 +30,7 @@
 %bcond_with test
 %endif
 Name:           libssh%{pkg_suffix}
-Version:        0.9.5
+Version:        0.9.6
 Release:        0
 Summary:        The SSH library
 License:        LGPL-2.1-or-later