diff --git a/manifests/init.pp b/manifests/init.pp
index 9e7aa273569fbb34f9ab7c168db2d82cee5a01f3..486875fec0df439ba047bdad5396459bcb17b798 100644
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -63,11 +63,11 @@ class apache::base
 	    require => Package['httpd'], notify => Class[apache::service];
     }
     # We do not want to blindly include things in the conf.d directory.
-    ensure_line {
+    regexp_replace_lines {
 	'apache::base::no_include_all':
 	    file => $apache::configfile,
-	    line => '##--Include conf.d/*.conf',
-	    pattern => '^\s*Include\s+conf\.d/\*\.conf\s*$',
+	    pattern => '^\s*Include[A-Za-z]*\s+conf\.d/.*\*.*$',
+	    replacement => '## DISABLED: \&',
 	    require => Package['httpd'],
 	    notify => Class[apache::service];
     }
@@ -177,10 +177,11 @@ define apache::include_file($content=undef, $source=undef, $ensure='present')
 		"apache::include_file::include::${name}":
 		    file => $apache::configfile,
 		    line => "Include conf.d/${name}.conf",
-		    where => '^##--Include conf\.d/\*\.conf$',
 		    addhow => append,
-		    require => [ Ensure_line['apache::base::no_include_all'],
-				 File[$includefile] ],
+		    require => [
+			Regexp_replace_lines['apache::base::no_include_all'],
+			File[$includefile]
+		    ],
 		    notify => Class[apache::service];
 	    }
 	}