diff --git a/conf/Changelog.txt b/conf/Changelog.txt
index 7f98a6ebbb..5cc69b88e1 100644
--- a/conf/Changelog.txt
+++ b/conf/Changelog.txt
@@ -1,5 +1,7 @@
 Date	Added
 
+2008/10/02
+	* Rev. 13253 Modified homunculus auto-vapor setting to yes. (bugreport:2298) [L0ne_W0lf]
 2008/09/11
 	* Rev. 13204 Updated some messages in msg_athena.conf. [L0ne_W0lf]
 2008/08/19
diff --git a/conf/battle/homunc.conf b/conf/battle/homunc.conf
index e8c45ec5c5..d9d501f4f2 100644
--- a/conf/battle/homunc.conf
+++ b/conf/battle/homunc.conf
@@ -48,4 +48,4 @@ homunculus_show_growth: no
 homunculus_autoloot: yes
 
 // Should homunculii Vaporize when Master dies?
-homunculus_auto_vapor: no
+homunculus_auto_vapor: yes