diff --git a/ChangeLog b/ChangeLog
index 2e84164e7b..6cf269d770 100755
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2005-11-16  Jeremy McNamara <jj@nufone.net>
+
+	* apps/app_voicemail.c (load_config): do not terminate asterisk if no voicemail config file
+
 2005-11-16  Josh Roberson <josh@asteriasgi.com>
 
 	* Makefile:  Update to fix non-responsive remote console on Darwin (OSX)(issue #5757)
diff --git a/apps/app_voicemail.c b/apps/app_voicemail.c
index 238623fed1..487d6e9fec 100755
--- a/apps/app_voicemail.c
+++ b/apps/app_voicemail.c
@@ -6228,8 +6228,8 @@ static int load_config(void)
 		return 0;
 	} else {
 		ast_mutex_unlock(&vmlock);
-		ast_log(LOG_WARNING, "Error reading voicemail config\n");
-		return -1;
+		ast_log(LOG_WARNING, "Failed to load configuration file. Module not activated.\n");
+		return 0;
 	}
 }