diff --git a/Changelog-Trunk.txt b/Changelog-Trunk.txt
index 46e9da8a85..d4c2bd3da6 100644
--- a/Changelog-Trunk.txt
+++ b/Changelog-Trunk.txt
@@ -4,6 +4,8 @@ AS OF SVN REV. 5091, WE ARE NOW USING TRUNK.  ALL UNTESTED BUGFIXES/FEATURES GO
 IF YOU HAVE A WORKING AND TESTED BUGFIX PUT IT INTO STABLE AS WELL AS TRUNK.
 
 2006/07/20
+	* Added source reporting when you do an invalid int&str or str&int
+	  operation on a script. [Skotlex]
 	* Fixed the intif party creation packet having the incorrect size sent,
 	  hence causing the leader's level to be read as garbage (which caused the
 	  "impossible to even share" bug). [Skotlex]
diff --git a/src/map/script.c b/src/map/script.c
index dbcf96be9f..f55355cd86 100644
--- a/src/map/script.c
+++ b/src/map/script.c
@@ -11327,6 +11327,7 @@ void op_2(struct script_state *st,int op)
 	}else{
 		// si,is => error
 		ShowWarning("script: op_2: int&str, str&int not allow.");
+		report_src(st);
 		push_val(st->stack,C_INT,0);
 	}
 }