diff --git a/conf-tmpl/Changelog.txt b/conf-tmpl/Changelog.txt
index ffed623c6c..571b8adaa4 100644
--- a/conf-tmpl/Changelog.txt
+++ b/conf-tmpl/Changelog.txt
@@ -1,5 +1,7 @@
 Date	Added
 
+2006/10/12
+	* Added Homunculus atcommands [Playtester]
 2006/10/11
 	* Removed useless inter_athena settings (they were doing absolutely
 	  nothing): read_gm_interval, gm_db, gm_db_level, gm_db_account_id,
diff --git a/conf-tmpl/atcommand_athena.conf b/conf-tmpl/atcommand_athena.conf
index 6f7ea8ed20..9371c27812 100644
--- a/conf-tmpl/atcommand_athena.conf
+++ b/conf-tmpl/atcommand_athena.conf
@@ -125,6 +125,10 @@ noask: 1
 // Displays remaining jail time
 jailtime: 1
 
+//Homunculus commands for players
+homtalk: 1
+hominfo: 1
+
 //---------------------------
 // 10: Super player+ commands
 
@@ -601,6 +605,13 @@ chardropall: 60
 // put a players possessions in storage
 charstoreall: 60
 
+//Homunculus commands for gms
+homlvup: 60
+homevolution: 60
+makehomun: 60
+homfriendly: 60
+homhungry: 60
+
 //----------------------
 // 80: GM Chief commands