2 files changed, 3 insertions, 0 deletions

diff --git a/debian/changelog b/debian/changelog
index d2d626831..cc5fd3e8b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,6 +5,8 @@ openssh (1:7.5p1-3) UNRELEASED; urgency=medium
   * Adjust OpenSSL dependencies for openssh-client-ssh1 too.
   * Fix purge failure when /etc/ssh has already somehow been removed
     (LP: #1682817).
+  * Ensure that /etc/ssh exists before trying to create /etc/ssh/sshd_config
+    (LP: #1685022).
 
  -- Colin Watson <cjwatson@debian.org>  Sat, 08 Apr 2017 15:39:13 +0100
 
diff --git a/debian/openssh-server.postinst b/debian/openssh-server.postinst
index f0ebe48b8..8b554ee1e 100644
--- a/debian/openssh-server.postinst
+++ b/debian/openssh-server.postinst
@@ -96,6 +96,7 @@ create_sshdconfig() {
                 sed -i 's/^#*PermitRootLogin .*/PermitRootLogin yes/' \
                         "$new_config"
         fi
+        mkdir -p /etc/ssh
         ucf --three-way --debconf-ok \
                 --sum-file /usr/share/openssh/sshd_config.md5sum \
                 "$new_config" /etc/ssh/sshd_config