diff --git a/doc/3RDPARTY b/doc/3RDPARTY
index 179965eeaa1f..6c6239719716 100644
--- a/doc/3RDPARTY
+++ b/doc/3RDPARTY
@@ -1,4 +1,4 @@
-#	$NetBSD: 3RDPARTY,v 1.1783 2021/03/01 22:07:58 christos Exp $
+#	$NetBSD: 3RDPARTY,v 1.1784 2021/03/05 18:04:18 christos Exp $
 #
 # This file contains a list of the software that has been integrated into
 # NetBSD where we are not the primary maintainer.
@@ -1070,12 +1070,12 @@ Notes:
 Patch applied after OpenSSH import.
 
 Package:	OpenSSH
-Version:	8.4
-Current Vers:	8.4 / portable 8.4p1
+Version:	8.5
+Current Vers:	8.5 / portable 8.5p1
 Maintainer:	OpenSSH
 Archive Site:	http://www.openssh.com/ftp.html
 Home Page:	http://www.openssh.com/portable.html
-Date:		2021-03-01
+Date:		2021-03-05
 Mailing List:	openssh-unix-announce@mindrot.org
 Responsible:	thorpej, christos, elric
 License:	BSD. See src/crypto/external/bsd/openssh/dist/LICENSE
diff --git a/doc/CHANGES b/doc/CHANGES
index 1844da474bec..f251d8f9d55d 100644
--- a/doc/CHANGES
+++ b/doc/CHANGES
@@ -1,4 +1,4 @@
-# LIST OF CHANGES FROM LAST RELEASE:			<$Revision: 1.2784 $>
+# LIST OF CHANGES FROM LAST RELEASE:			<$Revision: 1.2785 $>
 #
 #
 # [Note: This file does not mention every change made to the NetBSD source tree.
@@ -337,3 +337,4 @@ Changes from NetBSD 9.0 to NetBSD 10.0:
 	byacc: Update to 20210109. [christos 20210220]
 	wpa: Import wpa_supplicant and hostapd 2.9. [christos 20210228]
 	tzcode: Updated to 2021a. [christos 20210228]
+	OpenSSH: Import 8.5. [christos 20210304]