diff -Nur e-smith-openssh-2.4.0/root/etc/e-smith/db/configuration/defaults/sshd/Protocol e-smith-openssh-2.4.0_bz6381/root/etc/e-smith/db/configuration/defaults/sshd/Protocol
--- e-smith-openssh-2.4.0/root/etc/e-smith/db/configuration/defaults/sshd/Protocol	2006-03-14 18:15:45.000000000 +0100
+++ e-smith-openssh-2.4.0_bz6381/root/etc/e-smith/db/configuration/defaults/sshd/Protocol	1970-01-01 01:00:00.000000000 +0100
@@ -1 +0,0 @@
-2
diff -Nur e-smith-openssh-2.4.0/root/etc/e-smith/db/configuration/migrate/sshd.protocol e-smith-openssh-2.4.0_bz6381/root/etc/e-smith/db/configuration/migrate/sshd.protocol
--- e-smith-openssh-2.4.0/root/etc/e-smith/db/configuration/migrate/sshd.protocol	2006-03-14 18:15:45.000000000 +0100
+++ e-smith-openssh-2.4.0_bz6381/root/etc/e-smith/db/configuration/migrate/sshd.protocol	1970-01-01 01:00:00.000000000 +0100
@@ -1,9 +0,0 @@
-{
-    my $sshd = $DB->get('sshd');
-    return '' unless $sshd;
-    my $protocol = $sshd->prop('Protocol');
-    return '' if $protocol;
-
-    # Add backwards compatible mode for upgrades
-    $sshd->merge_props( Protocol => '2,1' );
-}
diff -Nur e-smith-openssh-2.4.0/root/etc/e-smith/templates/etc/ssh/sshd_config/20KeyRegenerationInterval e-smith-openssh-2.4.0_bz6381/root/etc/e-smith/templates/etc/ssh/sshd_config/20KeyRegenerationInterval
--- e-smith-openssh-2.4.0/root/etc/e-smith/templates/etc/ssh/sshd_config/20KeyRegenerationInterval	2002-02-14 21:51:15.000000000 +0100
+++ e-smith-openssh-2.4.0_bz6381/root/etc/e-smith/templates/etc/ssh/sshd_config/20KeyRegenerationInterval	1970-01-01 01:00:00.000000000 +0100
@@ -1 +0,0 @@
-KeyRegenerationInterval 3600
diff -Nur e-smith-openssh-2.4.0/root/etc/e-smith/templates/etc/ssh/sshd_config/20Protocol e-smith-openssh-2.4.0_bz6381/root/etc/e-smith/templates/etc/ssh/sshd_config/20Protocol
--- e-smith-openssh-2.4.0/root/etc/e-smith/templates/etc/ssh/sshd_config/20Protocol	2006-03-14 18:15:45.000000000 +0100
+++ e-smith-openssh-2.4.0_bz6381/root/etc/e-smith/templates/etc/ssh/sshd_config/20Protocol	2013-09-28 18:12:41.942065627 +0200
@@ -1,4 +1 @@
-{
-    my $protocol = $sshd{Protocol} || "2";
-    "Protocol $protocol";
-}
+Protocol 2
diff -Nur e-smith-openssh-2.4.0/root/etc/e-smith/templates/etc/ssh/sshd_config/20ServerKeyBits e-smith-openssh-2.4.0_bz6381/root/etc/e-smith/templates/etc/ssh/sshd_config/20ServerKeyBits
--- e-smith-openssh-2.4.0/root/etc/e-smith/templates/etc/ssh/sshd_config/20ServerKeyBits	2002-02-14 21:51:15.000000000 +0100
+++ e-smith-openssh-2.4.0_bz6381/root/etc/e-smith/templates/etc/ssh/sshd_config/20ServerKeyBits	1970-01-01 01:00:00.000000000 +0100
@@ -1 +0,0 @@
-ServerKeyBits 768
diff -Nur e-smith-openssh-2.4.0/root/etc/e-smith/templates/etc/ssh/sshd_config/40RhostsRSAAuthentication e-smith-openssh-2.4.0_bz6381/root/etc/e-smith/templates/etc/ssh/sshd_config/40RhostsRSAAuthentication
--- e-smith-openssh-2.4.0/root/etc/e-smith/templates/etc/ssh/sshd_config/40RhostsRSAAuthentication	2002-02-14 21:51:15.000000000 +0100
+++ e-smith-openssh-2.4.0_bz6381/root/etc/e-smith/templates/etc/ssh/sshd_config/40RhostsRSAAuthentication	1970-01-01 01:00:00.000000000 +0100
@@ -1,5 +0,0 @@
-{
-#
-# For this to work you will also need host keys in /etc/ssh_known_hosts
-}
-RhostsRSAAuthentication no
diff -Nur e-smith-openssh-2.4.0/root/etc/e-smith/templates/etc/ssh/sshd_config/40RSAAuthentication e-smith-openssh-2.4.0_bz6381/root/etc/e-smith/templates/etc/ssh/sshd_config/40RSAAuthentication
--- e-smith-openssh-2.4.0/root/etc/e-smith/templates/etc/ssh/sshd_config/40RSAAuthentication	2002-02-14 21:51:15.000000000 +0100
+++ e-smith-openssh-2.4.0_bz6381/root/etc/e-smith/templates/etc/ssh/sshd_config/40RSAAuthentication	1970-01-01 01:00:00.000000000 +0100
@@ -1 +0,0 @@
-RSAAuthentication yes