diff --git a/include/ap_regex.h b/include/ap_regex.h

index 7d8df79..7af2f99 100644

--- a/include/ap_regex.h

+++ b/include/ap_regex.h

@@ -84,7 +84,11 @@ extern "C" {

 #define AP_REG_DOLLAR_ENDONLY 0x200 /* '$' matches at end of subject string only */

-#define AP_REG_MATCH "MATCH_" /** suggested prefix for ap_regname */

+#define AP_REG_NO_DEFAULT 0x400 /**< Don't implicitely add AP_REG_DEFAULT options */

+

+#define AP_REG_MATCH "MATCH_" /**< suggested prefix for ap_regname */

+

+#define AP_REG_DEFAULT (AP_REG_DOTALL|AP_REG_DOLLAR_ENDONLY)

 /* Error values: */

 enum {

diff --git a/modules/filters/mod_substitute.c b/modules/filters/mod_substitute.c

index b7d5296..e976c51 100644

--- a/modules/filters/mod_substitute.c

+++ b/modules/filters/mod_substitute.c

@@ -667,8 +667,10 @@ static const char *set_pattern(cmd_parms *cmd, void *cfg, const char *line)

     /* first see if we can compile the regex */

     if (!is_pattern) {

-        r = ap_pregcomp(cmd->pool, from, AP_REG_EXTENDED |

-                        (ignore_case ? AP_REG_ICASE : 0));

+        int flags = AP_REG_NO_DEFAULT

+                    | (ap_regcomp_get_default_cflags() & AP_REG_DOLLAR_ENDONLY)

+                    | (ignore_case ? AP_REG_ICASE : 0);

+        r = ap_pregcomp(cmd->pool, from, flags);

         if (!r)

             return "Substitute could not compile regex";

     }

diff --git a/server/core.c b/server/core.c

index 76432ce..6d00777 100644

--- a/server/core.c

+++ b/server/core.c

@@ -4973,7 +4973,7 @@ static int core_pre_config(apr_pool_t *pconf, apr_pool_t *plog, apr_pool_t *ptem

         init_config_defines(pconf);

     apr_pool_cleanup_register(pconf, NULL, reset_config, apr_pool_cleanup_null);

-    ap_regcomp_set_default_cflags(AP_REG_DOLLAR_ENDONLY);

+    ap_regcomp_set_default_cflags(AP_REG_DEFAULT);

     mpm_common_pre_config(pconf);

diff --git a/server/util_pcre.c b/server/util_pcre.c

index f2cb1bb..2a665c8 100644

--- a/server/util_pcre.c

+++ b/server/util_pcre.c

@@ -120,7 +120,7 @@ AP_DECLARE(void) ap_regfree(ap_regex_t *preg)

  *            Compile a regular expression       *

  *************************************************/

-static int default_cflags = AP_REG_DOLLAR_ENDONLY;

+static int default_cflags = AP_REG_DEFAULT;

 AP_DECLARE(int) ap_regcomp_get_default_cflags(void)

 {

@@ -168,7 +168,8 @@ AP_DECLARE(int) ap_regcomp(ap_regex_t * preg, const char *pattern, int cflags)

     int errcode = 0;

     int options = PCRE_DUPNAMES;

-    cflags |= default_cflags;

+    if ((cflags & AP_REG_NO_DEFAULT) == 0)

+        cflags |= default_cflags;

     if ((cflags & AP_REG_ICASE) != 0)

         options |= PCRE_CASELESS;

     if ((cflags & AP_REG_NEWLINE) != 0)

diff --git a/server/util_regex.c b/server/util_regex.c

index 2a30d68..5405f8d 100644

--- a/server/util_regex.c

+++ b/server/util_regex.c

@@ -94,6 +94,7 @@ AP_DECLARE(ap_rxplus_t*) ap_rxplus_compile(apr_pool_t *pool,

     }

     /* anything after the current delimiter is flags */

+    ret->flags = ap_regcomp_get_default_cflags() & AP_REG_DOLLAR_ENDONLY;

     while (*++endp) {

         switch (*endp) {

         case 'i': ret->flags |= AP_REG_ICASE; break;

@@ -106,7 +107,7 @@ AP_DECLARE(ap_rxplus_t*) ap_rxplus_compile(apr_pool_t *pool,

         default: break; /* we should probably be stricter here */

         }

     }

-    if (ap_regcomp(&ret->rx, rxstr, ret->flags) == 0) {

+    if (ap_regcomp(&ret->rx, rxstr, AP_REG_NO_DEFAULT | ret->flags) == 0) {

         apr_pool_cleanup_register(pool, &ret->rx, rxplus_cleanup,

                                   apr_pool_cleanup_null);

     }