diff --git a/src/etc/inc/basic_sasl_client.inc b/src/etc/inc/notices.basic_sasl_client.inc
similarity index 100%
rename from src/etc/inc/basic_sasl_client.inc
rename to src/etc/inc/notices.basic_sasl_client.inc
diff --git a/src/etc/inc/cram_md5_sasl_client.inc b/src/etc/inc/notices.cram_md5_sasl_client.inc
similarity index 100%
rename from src/etc/inc/cram_md5_sasl_client.inc
rename to src/etc/inc/notices.cram_md5_sasl_client.inc
diff --git a/src/etc/inc/digest_sasl_client.inc b/src/etc/inc/notices.digest_sasl_client.inc
similarity index 100%
rename from src/etc/inc/digest_sasl_client.inc
rename to src/etc/inc/notices.digest_sasl_client.inc
diff --git a/src/etc/inc/login_sasl_client.inc b/src/etc/inc/notices.login_sasl_client.inc
similarity index 100%
rename from src/etc/inc/login_sasl_client.inc
rename to src/etc/inc/notices.login_sasl_client.inc
diff --git a/src/etc/inc/ntlm_sasl_client.inc b/src/etc/inc/notices.ntlm_sasl_client.inc
similarity index 100%
rename from src/etc/inc/ntlm_sasl_client.inc
rename to src/etc/inc/notices.ntlm_sasl_client.inc
diff --git a/src/etc/inc/plain_sasl_client.inc b/src/etc/inc/notices.plain_sasl_client.inc
similarity index 100%
rename from src/etc/inc/plain_sasl_client.inc
rename to src/etc/inc/notices.plain_sasl_client.inc
diff --git a/src/etc/inc/notices.sasl.inc b/src/etc/inc/notices.sasl.inc
index dc30ceb7f..21ad3b87d 100644
--- a/src/etc/inc/notices.sasl.inc
+++ b/src/etc/inc/notices.sasl.inc
@@ -116,12 +116,12 @@ class sasl_client_class
 
 	var $driver;
 	var $drivers=array(
-		"Digest"   => array("digest_sasl_client_class",   "digest_sasl_client.inc"   ),
-		"CRAM-MD5" => array("cram_md5_sasl_client_class", "cram_md5_sasl_client.inc" ),
-		"LOGIN"    => array("login_sasl_client_class",    "login_sasl_client.inc"    ),
-		"NTLM"     => array("ntlm_sasl_client_class",     "ntlm_sasl_client.inc"     ),
-		"PLAIN"    => array("plain_sasl_client_class",    "plain_sasl_client.inc"    ),
-		"Basic"    => array("basic_sasl_client_class",    "basic_sasl_client.inc"    )
+		"Digest"   => array("digest_sasl_client_class",   "notices.digest_sasl_client.inc"   ),
+		"CRAM-MD5" => array("cram_md5_sasl_client_class", "notices.cram_md5_sasl_client.inc" ),
+		"LOGIN"    => array("login_sasl_client_class",    "notices.login_sasl_client.inc"    ),
+		"NTLM"     => array("ntlm_sasl_client_class",     "notices.ntlm_sasl_client.inc"     ),
+		"PLAIN"    => array("plain_sasl_client_class",    "notices.plain_sasl_client.inc"    ),
+		"Basic"    => array("basic_sasl_client_class",    "notices.basic_sasl_client.inc"    )
 	);
 	var $credentials=array();