diff --git a/configure.ac b/configure.ac
index 7f132c0f1..7f07764dd 100644
--- a/configure.ac
+++ b/configure.ac
@@ -148,12 +148,24 @@ then
 fi
 
 
+# OpenSSH compatibility Build
+AC_ARG_ENABLE([openssh],
+    [AS_HELP_STRING([--enable-openssh],[Enable OpenSSH compatibility build (default: disabled)])],
+    [ENABLED_OPENSSH=$enableval],
+    [ENABLED_OPENSSH=no])
+
+
 # OPENSSL Extra Compatibility
 AC_ARG_ENABLE([opensslextra],
     [  --enable-opensslextra   Enable extra OpenSSL API, size+ (default: disabled)],
     [ ENABLED_OPENSSLEXTRA=$enableval ],
     [ ENABLED_OPENSSLEXTRA=no ]
     )
+if test "$ENABLED_OPENSSH" = "yes"
+then
+    ENABLED_OPENSSLEXTRA="yes"
+fi
+
 if test "$ENABLED_OPENSSLEXTRA" = "yes"
 then
   AM_CFLAGS="-DOPENSSL_EXTRA $AM_CFLAGS"
@@ -194,6 +206,11 @@ AC_ARG_ENABLE([fortress],
     [ ENABLED_FORTRESS=no ]
     )
 
+if test "$ENABLED_OPENSSH" = "yes"
+then
+    ENABLED_FORTRESS="yes"
+fi
+
 if test "$ENABLED_FORTRESS" = "yes"
 then
     AM_CFLAGS="$AM_CFLAGS -DFORTRESS -DWOLFSSL_ALWAYS_VERIFY_CB -DOPENSSL_EXTRA -DWOLFSSL_DES_ECB -DWOLFSSL_AES_COUNTER -DWOLFSSL_AES_DIRECT -DWOLFSSL_DER_LOAD -DWOLFSSL_SHA512 -DWOLFSSL_SHA384 -DWOLFSSL_KEY_GEN"
@@ -481,6 +498,11 @@ AC_ARG_ENABLE([nullcipher],
     [ ENABLED_NULL_CIPHER=no ]
     )
 
+if test "$ENABLED_OPENSSH" = "yes"
+then
+    ENABLED_NULL_CIPHER="yes"
+fi
+
 if test "$ENABLED_NULL_CIPHER" = "yes"
 then
     AM_CFLAGS="$AM_CFLAGS -DHAVE_NULL_CIPHER"
@@ -493,6 +515,11 @@ AC_ARG_ENABLE([ripemd],
     [ ENABLED_RIPEMD=no ]
     )
 
+if test "$ENABLED_OPENSSH" = "yes"
+then
+    ENABLED_RIPEMD="yes"
+fi
+
 if test "$ENABLED_RIPEMD" = "yes"
 then
     AM_CFLAGS="$AM_CFLAGS -DWOLFSSL_RIPEMD"
@@ -536,6 +563,11 @@ then
     ENABLED_SHA512=no
 fi
 
+if test "$ENABLED_OPENSSH" = "yes"
+then
+    ENABLED_SHA512="yes"
+fi
+
 if test "$ENABLED_SHA512" = "yes"
 then
     AM_CFLAGS="$AM_CFLAGS -DWOLFSSL_SHA512 -DWOLFSSL_SHA384"
@@ -637,6 +669,11 @@ AC_ARG_ENABLE([dsa],
     [ ENABLED_DSA=no ]
     )
 
+if test "$ENABLED_OPENSSH" = "yes"
+then
+    ENABLED_DSA="yes"
+fi
+
 if test "$ENABLED_DSA" = "no"
 then
     AM_CFLAGS="$AM_CFLAGS -DNO_DSA"
@@ -666,6 +703,11 @@ then
     ENABLED_ECC=no
 fi
 
+if test "$ENABLED_OPENSSH" = "yes"
+then
+    ENABLED_ECC="yes"
+fi
+
 if test "$ENABLED_ECC" = "yes"
 then
     AM_CFLAGS="$AM_CFLAGS -DHAVE_ECC -DTFM_ECC256 -DECC_SHAMIR"
@@ -901,6 +943,11 @@ AC_ARG_ENABLE([dh],
     [ ENABLED_DH=yes ]
     )
 
+if test "$ENABLED_OPENSSH" = "yes"
+then
+    ENABLED_DH="yes"
+fi
+
 if test "$ENABLED_DH" = "no"
 then
     AM_CFLAGS="$AM_CFLAGS -DNO_DH"
@@ -1079,6 +1126,11 @@ AC_ARG_ENABLE([arc4],
     [ ENABLED_ARC4=no ]
     )
 
+if test "$ENABLED_OPENSSH" = "yes"
+then
+    ENABLED_ARC4="yes"
+fi
+
 if test "$ENABLED_ARC4" = "no"
 then
     AM_CFLAGS="$AM_CFLAGS -DNO_RC4"
@@ -2236,6 +2288,7 @@ echo
 echo "   Features "
 echo "   * Single threaded:           $ENABLED_SINGLETHREADED"
 echo "   * Filesystem:                $ENABLED_FILESYSTEM"
+echo "   * OpenSSH Build:             $ENABLED_OPENSSH"
 echo "   * OpenSSL Extra API:         $ENABLED_OPENSSLEXTRA"
 echo "   * Max Strength Build:        $ENABLED_MAXSTRENGTH"
 echo "   * fastmath:                  $ENABLED_FASTMATH"