diff --git a/demo/jline-gogo.bat b/demo/jline-gogo.bat
index 410f61f9e..63d64ac6f 100755
--- a/demo/jline-gogo.bat
+++ b/demo/jline-gogo.bat
@@ -52,6 +52,7 @@ set "logconf=%DIRNAME%etc\logging.properties"
     goto :RUN_LOOP
 
 :EXECUTE_SSH
+    for %%G in (sshd-common-*.jar) do call:APPEND_TO_CLASSPATH %%G
     for %%G in (sshd-core-*.jar) do call:APPEND_TO_CLASSPATH %%G
     for %%G in (slf4j-api-*.jar) do call:APPEND_TO_CLASSPATH %%G
     for %%G in (slf4j-jdk14-*.jar) do call:APPEND_TO_CLASSPATH %%G
diff --git a/demo/jline-gogo.sh b/demo/jline-gogo.sh
index e28541206..7074b551f 100755
--- a/demo/jline-gogo.sh
+++ b/demo/jline-gogo.sh
@@ -53,6 +53,7 @@ while [ "${1}" != "" ]; do
             shift
             ;;
         'ssh' | 'telnet' | 'remote')
+            cp=${cp}$(find ${TARGETDIR}/lib -name "sshd-common-*.jar" -exec printf :{} ';')
             cp=${cp}$(find ${TARGETDIR}/lib -name "sshd-core-*.jar" -exec printf :{} ';')
             cp=${cp}$(find ${TARGETDIR}/lib -name "slf4j-api-*.jar" -exec printf :{} ';')
             cp=${cp}$(find ${TARGETDIR}/lib -name "slf4j-jdk14-*.jar" -exec printf :{} ';')
diff --git a/demo/pom.xml b/demo/pom.xml
index 5bf351935..2539a268c 100644
--- a/demo/pom.xml
+++ b/demo/pom.xml
@@ -48,6 +48,11 @@
             <artifactId>jansi</artifactId>
         </dependency>
 
+        <dependency>
+            <groupId>org.apache.sshd</groupId>
+            <artifactId>sshd-common</artifactId>
+        </dependency>
+
         <dependency>
             <groupId>org.apache.sshd</groupId>
             <artifactId>sshd-core</artifactId>
diff --git a/pom.xml b/pom.xml
index 3edf79f37..a8edcdbb3 100644
--- a/pom.xml
+++ b/pom.xml
@@ -184,6 +184,12 @@
                 <version>${juniversalchardet.version}</version>
             </dependency>
 
+            <dependency>
+                <groupId>org.apache.sshd</groupId>
+                <artifactId>sshd-common</artifactId>
+                <version>${sshd.version}</version>
+            </dependency>
+
             <dependency>
                 <groupId>org.apache.sshd</groupId>
                 <artifactId>sshd-core</artifactId>