diff -Nru openssh-7.2p2/debian/changelog openssh-7.2p2/debian/changelog
--- openssh-7.2p2/debian/changelog	2018-01-18 13:38:28.000000000 +0000
+++ openssh-7.2p2/debian/changelog	2018-08-21 17:45:26.000000000 +0000
@@ -1,3 +1,10 @@
+openssh (1:7.2p2-4ubuntu2.5) xenial; urgency=medium
+
+  * debian/systemd/ssh.service: Test configuration before starting or
+    reloading sshd (LP: #1771340)
+
+ -- Karl Stenerud <karl.stenerud@canonical.com>  Tue, 21 Aug 2018 10:45:26 -0700
+
 openssh (1:7.2p2-4ubuntu2.4) xenial-security; urgency=medium
 
   * SECURITY UPDATE: untrusted search path when loading PKCS#11 modules
diff -Nru openssh-7.2p2/debian/openssh-server.ssh.service openssh-7.2p2/debian/openssh-server.ssh.service
--- openssh-7.2p2/debian/openssh-server.ssh.service	2017-03-16 13:38:37.000000000 +0000
+++ openssh-7.2p2/debian/openssh-server.ssh.service	2018-08-21 17:45:26.000000000 +0000
@@ -5,7 +5,9 @@
 
 [Service]
 EnvironmentFile=-/etc/default/ssh
+ExecStartPre=/usr/sbin/sshd -t
 ExecStart=/usr/sbin/sshd -D $SSHD_OPTS
+ExecReload=/usr/sbin/sshd -t
 ExecReload=/bin/kill -HUP $MAINPID
 KillMode=process
 Restart=on-failure
diff -Nru openssh-7.2p2/debian/systemd/ssh.service openssh-7.2p2/debian/systemd/ssh.service
--- openssh-7.2p2/debian/systemd/ssh.service	2017-03-16 13:38:37.000000000 +0000
+++ openssh-7.2p2/debian/systemd/ssh.service	2018-08-21 17:45:26.000000000 +0000
@@ -5,7 +5,9 @@
 
 [Service]
 EnvironmentFile=-/etc/default/ssh
+ExecStartPre=/usr/sbin/sshd -t
 ExecStart=/usr/sbin/sshd -D $SSHD_OPTS
+ExecReload=/usr/sbin/sshd -t
 ExecReload=/bin/kill -HUP $MAINPID
 KillMode=process
 Restart=on-failure