diff --git a/Changelog-SVN.txt b/Changelog-SVN.txt
index f8257d7adf..1376356f90 100644
--- a/Changelog-SVN.txt
+++ b/Changelog-SVN.txt
@@ -1,5 +1,9 @@
 Date	Added
 
+03/19
+        * Fixed day and night settings not ignored even if they are set to 0,
+          my bad ^^; [celest]
+
 03/18
         * Fixed a crash when freeing memory of pets [celest]
         * Added Cygwin support to the -DDUMPSTACK option, and changed its format
diff --git a/src/map/battle.c b/src/map/battle.c
index e3980090d7..483ddffb71 100644
--- a/src/map/battle.c
+++ b/src/map/battle.c
@@ -4478,9 +4478,9 @@ void battle_validate_conf() {
 		battle_config.night_at_start = 0;
 	else if (battle_config.night_at_start > 1) // added by [Yor]
 		battle_config.night_at_start = 1;
-	if (battle_config.day_duration < 60000) // added by [Yor]
+	if (battle_config.day_duration != 0 && battle_config.day_duration < 60000) // added by [Yor]
 		battle_config.day_duration = 60000;
-	if (battle_config.night_duration < 60000) // added by [Yor]
+	if (battle_config.night_duration != 0 && battle_config.night_duration < 60000) // added by [Yor]
 		battle_config.night_duration = 60000;
 	
 	if (battle_config.ban_spoof_namer < 0) // added by [Yor]