4 files changed, 3 insertions, 19 deletions
diff --git a/Makefile.am b/Makefile.am
index 0bae978d..f654541c 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -116,7 +116,7 @@ rsyslogdir = /etc/rsyslog.d
 rsyslog_DATA = sysconf/vyatta-log.conf
 
 curver_DATA = cfg-version/vrrp@1
-curver_DATA += cfg-version/system@5
+curver_DATA += cfg-version/system@6
 
 cpiop = find  . ! -regex '\(.*~\|.*\.bak\|.*\.swp\|.*\#.*\#\)' -print0 | \
   cpio -0pd
diff --git a/cfg-version/system@5 b/cfg-version/system@6
index e69de29b..e69de29b 100644
--- a/cfg-version/system@5
+++ b/cfg-version/system@6
diff --git a/templates/service/ssh/node.def b/templates/service/ssh/node.def
index 55f94551..7117a2fd 100644
--- a/templates/service/ssh/node.def
+++ b/templates/service/ssh/node.def
@@ -2,13 +2,7 @@ priority: 500 # After syslog and logins
 help: Secure SHell (SSH) protocol
 delete:sudo /usr/sbin/invoke-rc.d ssh stop 
        sudo sh -c "echo 'SSHD_OPTS=' > /etc/default/ssh"
-end: if [ -z "$VAR(port/@)" ]; then exit 0; fi;
-     case $VAR(protocol-version/@) in
-     v2) VER=2;;
-     v1) VER=1;;
-     all) VER="1,2";;
-      *) VER=2;;
-     esac;
-     STR="SSHD_OPTS=\"-p $VAR(port/@) -o Protocol=${VER}\""
+end: if [ -z "$VAR(port/@)" ]; then exit 0; fi
+     STR="SSHD_OPTS=\"-p $VAR(port/@)\""
      sudo sh -c "echo '$STR' > /etc/default/ssh"
      sudo /usr/sbin/invoke-rc.d ssh restart
diff --git a/templates/service/ssh/protocol-version/node.def b/templates/service/ssh/protocol-version/node.def
deleted file mode 100644
index 6b52204d..00000000
--- a/templates/service/ssh/protocol-version/node.def
+++ /dev/null
@@ -1,10 +0,0 @@
-type:  txt 
-allowed: echo "v1 v2 all"
-default:  "v2"
-syntax:expression: $VAR(@) in "v1", "v2", "all" ;
-	"Invalid SSH protocol version"
-
-help: SSH protocol version
-val_help: v1; Protocol version 1 (UNSECURE DO NOT USE)
-val_help: v2; Protocol version 2 (default)
-val_help: all; Both version 1 and version 2 supported