diff --git a/Changelog-Trunk.txt b/Changelog-Trunk.txt
index ed34bd94ca..80f9137743 100644
--- a/Changelog-Trunk.txt
+++ b/Changelog-Trunk.txt
@@ -6,6 +6,7 @@ GOES INTO TRUNK AND WILL BE MERGED INTO STABLE BY VALARIS AND WIZPUTER. -- VALAR
 
 
 2006/03/26
+	* Fixed a problem in chrif.c where USHRT_MAX was undefined. [Codemaster]
 	* Added jAthena's new start and athena-start shell scripts. [Lance]
 	* Changed status_point/skill_point to unsigned short. Adjusted the code as
 	  necessary to prevent overflows. [Skotlex]
diff --git a/src/map/chrif.c b/src/map/chrif.c
index 3a11222fb5..174bb5c271 100644
--- a/src/map/chrif.c
+++ b/src/map/chrif.c
@@ -35,6 +35,10 @@
 //Used Packets: U->2af8
 //Free Packets: F->2af8
 
+#ifndef USHRT_MAX
+	#define USHRT_MAX 65535
+#endif
+
 struct dbt *auth_db;
 
 static const int packet_len_table[0x3d] = {