diff --git a/src/detect-engine.c b/src/detect-engine.c
index 5352ae7a5f..8349e4fd39 100644
--- a/src/detect-engine.c
+++ b/src/detect-engine.c
@@ -184,7 +184,7 @@ static uint8_t DetectEngineCtxLoadConf(DetectEngineCtx *de_ctx) {
         } else if (strcmp(sgh_mpm_context, "auto") == 0) {
             /* for now, since we still haven't implemented any intelligence into
              * understanding the patterns and distributing mpm_ctx across sgh */
-            if (de_ctx->mpm_matcher == MPM_AC)
+            if (de_ctx->mpm_matcher == MPM_AC || de_ctx->mpm_matcher == MPM_AC_GFBS)
                 de_ctx->sgh_mpm_context = ENGINE_SGH_MPM_FACTORY_CONTEXT_SINGLE;
             else
                 de_ctx->sgh_mpm_context = ENGINE_SGH_MPM_FACTORY_CONTEXT_FULL;
diff --git a/suricata.yaml b/suricata.yaml
index 41a9e23761..34c335b68c 100644
--- a/suricata.yaml
+++ b/suricata.yaml
@@ -144,8 +144,8 @@ cuda:
   device_id: 0
 
 # Select the multi pattern algorithm you want to run for scan/search the
-# in the engine. The supported algorithms are b2g, b3g, wumanber, ac and
-# ac-gfbs.
+# in the engine. The supported algorithms are b2g, b2gc, b2gm, b3g, wumanber,
+# ac and ac-gfbs.
 #
 # The mpm you choose also decides the distribution of mpm contexts for
 # signature groups, specified by the conf - "detect-engine.sgh_mpm_context".