diff --git a/Makefile b/Makefile
index 2e3fbaf..ad84317 100644
--- a/Makefile
+++ b/Makefile
@@ -15,7 +15,7 @@ export URL = http://www.openssh.com/
 BRIEF = OpenSSH client and server
 DESC = OpenSSH is the premier connectivity tool for remote login with the \
 SSH protocol.
-SNAPVER = 4
+SNAPVER = 5
 
 ARCHIVE := $(PWD)/SRC/$(shell ls SRC|egrep '(bz2|gz|tar|xz)$$'|tail -1)
 TYPE := $(shell file -ib $(ARCHIVE)|cut -d';' -f1|tr -d '\n')
@@ -41,21 +41,25 @@ $(CLIENTROOT): $(SRCDIR)/sshd
 	fi
 	cd $(SRCDIR) && make install DESTDIR=$(CLIENTROOT) && \
 	install -v -d -m 755 $(CLIENTROOT)/usr/share/doc/openssh && \
+	install -v -d -m 755 $(CLIENTROOT)/usr/share/openssh && \
 	install -v -m 755 contrib/ssh-copy-id $(CLIENTROOT)/usr/bin && \
 	install -v -m 644 contrib/ssh-copy-id.1 \
 		$(CLIENTROOT)/usr/share/man/man1 && \
 	install -v -m644 INSTALL LICENCE OVERVIEW README* \
 		$(CLIENTROOT)/usr/share/doc/openssh && \
 	gzip $(CLIENTROOT)/usr/share/doc/openssh/* && \
+	mv -v $(CLIENTROOT)/etc/ssh/ssh_config \
+		$(CLIENTROOT)/usr/share/openssh && \
 	install -v -d $(SERVER)/SNAP && \
 	install -v -d $(SERVERROOT) && \
 	install -v -d -m 755 $(SERVERROOT)/etc/{ssh,init.d} && \
 	install -v -d -m 755 $(SERVERROOT)/usr/{libexec,sbin} && \
 	install -v -d -m 755 $(SERVERROOT)/usr/share/man/man{5,8} && \
+	install -v -d -m 755 $(SERVERROOT)/usr/share/openssh && \
 	install -v -m 755 $(PWD)/SNAP/sshd.init \
 		$(SERVERROOT)/etc/init.d/sshd && \
 	mv -v $(CLIENTROOT)/etc/ssh/sshd_config \
-		$(SERVERROOT)/etc/ssh/sshd_config && \
+		$(SERVERROOT)/usr/share/openssh/sshd_config && \
 	mv -v $(CLIENTROOT)/usr/libexec/sftp-server \
 		$(SERVERROOT)/usr/libexec/sftp-server && \
 	mv -v $(CLIENTROOT)/usr/sbin/sshd \
diff --git a/SNAP/usher b/SNAP/usher
index a1dd05a..d67e2b0 100755
--- a/SNAP/usher
+++ b/SNAP/usher
@@ -1,5 +1,7 @@
 #!/bin/bash
 
+set -e
+
 case $1 in
   preinst)
     exit 0
@@ -27,6 +29,14 @@ case $1 in
       if [ ! -f ${TARGET}/etc/ssh/ssh_host_rsa_key ]; then
         chroot ${TARGET} 'ssh-keygen -A'
       fi
+
+      if [ ! -f ${TARGET}/etc/ssh/ssh_config ]; then
+        cp ${TARGET}/usr/share/openssh/ssh_config ${TARGET}/etc/ssh
+      fi
+
+      if [ ! -f ${TARGET}/etc/ssh/sshd_config ]; then
+        cp ${TARGET}/usr/share/openssh/sshd_config ${TARGET}/etc/ssh
+      fi
     else
       if ! getent group sshd 2>&1 > /dev/null; then
         if groupadd -g 50 sshd; then
@@ -49,6 +59,14 @@ case $1 in
       if [ ! -f /etc/ssh/ssh_host_rsa_key ]; then
         ssh-keygen -A
       fi
+
+      if [ ! -f /etc/ssh/ssh_config ]; then
+        cp /usr/share/openssh/ssh_config /etc/ssh
+      fi
+
+      if [ ! -f /etc/ssh/sshd_config ]; then
+        cp /usr/share/openssh/sshd_config /etc/ssh
+      fi
     fi
     ;;
   prerm)