diff --git a/SPECS/openssh/openssh.signatures.json b/SPECS/openssh/openssh.signatures.json
index 7a06e6f98e1..b134cc672e3 100644
--- a/SPECS/openssh/openssh.signatures.json
+++ b/SPECS/openssh/openssh.signatures.json
@@ -3,6 +3,6 @@
   "blfs-systemd-units-20191026.tar.xz": "10f20d2f8db4dc48b4f9257c47821df238808fca3566c65a8c7e2284172da789",
   "openssh-8.0p1.tar.gz": "bd943879e69498e8031eb6b7f44d08cdc37d59a7ab689aa0b437320c3481fd68",
   "sshd-keygen.service": "331515a4fb37951122ac8447111b126368386a49ac429f500fe3819ba25a70be",
-  "sshd.service": "e9f3be1eb8f46e5df2446c3459c2bd7e544d71d71608e2534fcfb7b9f2399cae"
+  "sshd.service": "9233e23c1cc89316630ce25e14403f8cdb8503cf4235cc1d864770b5b56e28d2"
  }
-}
\ No newline at end of file
+}
diff --git a/SPECS/openssh/openssh.spec b/SPECS/openssh/openssh.spec
index 00b23cc1242..f2c684429b4 100644
--- a/SPECS/openssh/openssh.spec
+++ b/SPECS/openssh/openssh.spec
@@ -1,7 +1,7 @@
 Summary:        Free version of the SSH connectivity tools
 Name:           openssh
 Version:        8.0p1
-Release:        7%{?dist}
+Release:        8%{?dist}
 License:        BSD
 URL:            https://www.openssh.com/
 Group:          System Environment/Security
@@ -171,6 +171,8 @@ rm -rf %{buildroot}/*
 %{_mandir}/man8/ssh-pkcs11-helper.8.gz
 
 %changelog
+*   Wed Sep 02 2020 Jim Perrin <jim.perrin@microsoft.com> 8.0p1-8
+-   Add wants=sshd-keygen.service to sshd.service for easier service starting
 *   Thu Jun 04 2020 Chris Co <chrco@microsoft.com> 8.0p1-7
 -   Use default MaxAuthTries value of 6
 *   Tue May 26 2020 Pawel Winogrodzki <pawelwi@microsoft.com> 8.0p1-6
diff --git a/SPECS/openssh/sshd.service b/SPECS/openssh/sshd.service
index 99e2d8230fb..5e927d8ff32 100644
--- a/SPECS/openssh/sshd.service
+++ b/SPECS/openssh/sshd.service
@@ -1,6 +1,7 @@
 [Unit]
 Description=OpenSSH Daemon
 After=network.target sshd-keygen.service
+Wants=sshd-keygen.service
 
 [Service]
 ExecStart=/usr/sbin/sshd -D