diff --git a/karaf/assembly/src/main/distribution/text/etc/org.apache.felix.karaf.shell.cfg b/karaf/assembly/src/main/distribution/text/etc/org.apache.felix.karaf.shell.cfg
index 0a2eafe..555d451 100644
--- a/karaf/assembly/src/main/distribution/text/etc/org.apache.felix.karaf.shell.cfg
+++ b/karaf/assembly/src/main/distribution/text/etc/org.apache.felix.karaf.shell.cfg
@@ -19,5 +19,6 @@
 
 #
 sshPort=8101
+sshHost=0.0.0.0
 sshRealm=karaf
 hostKey=${karaf.base}/etc/host.key
diff --git a/karaf/pom.xml b/karaf/pom.xml
index b9c64f5..4080c21 100644
--- a/karaf/pom.xml
+++ b/karaf/pom.xml
@@ -102,7 +102,7 @@
         <servlet.api.version>2.5</servlet.api.version>
         <spring.osgi.version>1.2.0</spring.osgi.version>
         <spring.version>2.5.6.SEC01</spring.version>
-        <sshd.version>0.3.0</sshd.version>
+        <sshd.version>0.4.0-SNAPSHOT</sshd.version>
 
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <appendedResourcesDirectory>${basedir}/etc/appended-resources</appendedResourcesDirectory>
diff --git a/karaf/shell/ssh/src/main/resources/OSGI-INF/blueprint/shell-ssh.xml b/karaf/shell/ssh/src/main/resources/OSGI-INF/blueprint/shell-ssh.xml
index ed69a58..3f6edbc 100644
--- a/karaf/shell/ssh/src/main/resources/OSGI-INF/blueprint/shell-ssh.xml
+++ b/karaf/shell/ssh/src/main/resources/OSGI-INF/blueprint/shell-ssh.xml
@@ -32,6 +32,7 @@
     <cm:property-placeholder persistent-id="org.apache.felix.karaf.shell">
         <cm:default-properties>
             <cm:property name="sshPort" value="8101"/>
+            <cm:property name="sshHost" value="0.0.0.0"/>
             <cm:property name="sshRealm" value="karaf"/>
             <cm:property name="hostKey" value="${karaf.base}/etc/host.key"/>
         </cm:default-properties>
@@ -59,6 +60,7 @@
 
     <bean id="sshServer" class="org.apache.sshd.SshServer" factory-method="setUpDefaultServer" scope="prototype">
         <property name="port" value="${sshPort}"/>
+        <property name="host" value="${sshHost}"/>
         <property name="shellFactory">
             <bean class="org.apache.felix.karaf.shell.ssh.ShellFactoryImpl">
                 <property name="completers">