diff --git a/Changelog-Trunk.txt b/Changelog-Trunk.txt
index 09e663ba2e..06d8958005 100644
--- a/Changelog-Trunk.txt
+++ b/Changelog-Trunk.txt
@@ -1,5 +1,7 @@
 Date	Added
 
+2010/12/18
+	* Fixed usage of literals for map name length in character list packet (since r14368). [Ai4rei]
 2010/12/17
 	* Made the 'player not attached' script error also report the function it occured in, if available. [Ai4rei]
 	* Fixed a crash, when script command 'doevent' is called without an attached player (bugreport:3973). [Ai4rei]
diff --git a/src/char/char.c b/src/char/char.c
index ad18658baf..c61a84d29f 100644
--- a/src/char/char.c
+++ b/src/char/char.c
@@ -1738,7 +1738,7 @@ int mmo_char_tobuf(uint8* buffer, struct mmo_charstatus* p)
 #endif
 #if (PACKETVER >= 20100720 && PACKETVER <= 20100727) || PACKETVER >= 20100803
 	mapindex_getmapname_ext(mapindex_id2name(p->last_point.map), (char*)WBUFP(buf,108));
-	offset += 16;
+	offset += MAP_NAME_LENGTH_EXT;
 #endif
 	return 106+offset;
 }
diff --git a/src/char_sql/char.c b/src/char_sql/char.c
index 95e4b34714..d33ba46bd6 100644
--- a/src/char_sql/char.c
+++ b/src/char_sql/char.c
@@ -1602,7 +1602,7 @@ int mmo_char_tobuf(uint8* buffer, struct mmo_charstatus* p)
 #endif
 #if (PACKETVER >= 20100720 && PACKETVER <= 20100727) || PACKETVER >= 20100803
 	mapindex_getmapname_ext(mapindex_id2name(p->last_point.map), (char*)WBUFP(buf,108));
-	offset += 16;
+	offset += MAP_NAME_LENGTH_EXT;
 #endif
 	return 106+offset;
 }