diff --git a/Makefile b/Makefile
index 95e455e..fbfba05 100644
--- a/Makefile
+++ b/Makefile
@@ -11,7 +11,7 @@ PREFIX = /usr/local
 
 MAJOR = 1
 MINOR = 10
-REVISION = 5
+REVISION = 6
 LIB = libcli.so
 LIB_STATIC = libcli.a
 
diff --git a/libcli.c b/libcli.c
index 7ed96a7..3ff35ef 100644
--- a/libcli.c
+++ b/libcli.c
@@ -2912,6 +2912,7 @@ static int cli_int_locate_command(struct cli_def *cli, struct cli_command *comma
   // Drop out of config submode if we have matched command on MODE_CONFIG
   if (again_config) {
     c = again_config;
+    cli_set_configmode(cli, MODE_CONFIG, NULL);
     goto AGAIN;
   }
   if (again_any) {
diff --git a/libcli.h b/libcli.h
index 024b2a7..c10c79e 100644
--- a/libcli.h
+++ b/libcli.h
@@ -13,7 +13,7 @@ extern "C" {
 
 #define LIBCLI_VERSION_MAJOR 1
 #define LIBCLI_VERISON_MINOR 10
-#define LIBCLI_VERISON_REVISION 5
+#define LIBCLI_VERISON_REVISION 6
 #define LIBCLI_VERSION ((LIBCLI_VERSION_MAJOR << 16) | (LIBCLI_VERSION_MINOR << 8) | LIBCLI_VERSION_REVISION)
 
 #define CLI_OK 0
diff --git a/libcli.spec b/libcli.spec
index cbb838b..0d21c11 100644
--- a/libcli.spec
+++ b/libcli.spec
@@ -1,4 +1,4 @@
-Version: 1.10.5
+Version: 1.10.6
 Summary: Cisco-like telnet command-line library
 Name: libcli
 Release: 1
@@ -67,6 +67,11 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(-, root, root)
 
 %changelog
+* Mon Feb 22 2021 Rob Sanders <rsanders.forcepoint.com> 1.10.6
+- Fix bug when a command not found in the current mode, but is found
+  in the CONFIG_MODE, which would resultin an an infinate loop.  Bug
+  reported by Stefan Mächler (github @machste).
+
 * Wed Jan 27 2021 Gerrit Huizenga <gerrit@us.ibm.com> 1.10.5
 - Add ppc64le to travis builds