diff --git a/Changelog-Trunk.txt b/Changelog-Trunk.txt
index 3dbe7b7534..e44dac3c3a 100644
--- a/Changelog-Trunk.txt
+++ b/Changelog-Trunk.txt
@@ -3,6 +3,7 @@ Date	Added
 AS OF SVN REV. 5091, WE ARE NOW USING TRUNK.  ALL UNTESTED BUGFIXES/FEATURES GO INTO TRUNK.
 IF YOU HAVE A WORKING AND TESTED BUGFIX PUT IT INTO STABLE AS WELL AS TRUNK.
 2006/08/04
+	* Updated @mobinfo to display slots in the drop information. [Skotlex]
 	* Fixed flag.elefix not being respected in battle_calc_misc_damage.
 	  [Skotlex]
 	* Some code cleanups in battle_calc_damage. [Skotlex]
diff --git a/src/map/atcommand.c b/src/map/atcommand.c
index 695cdf4164..76e5cd9dba 100644
--- a/src/map/atcommand.c
+++ b/src/map/atcommand.c
@@ -9737,15 +9737,16 @@ int atcommand_mobinfo(
 		strcpy(atcmd_output, " ");
 		j = 0;
 		for (i = 0; i < MAX_MOB_DROP; i++) {
-			if (mob->dropitem[i].nameid <= 0 || (item_data = itemdb_search(mob->dropitem[i].nameid)) == NULL)
+			if (mob->dropitem[i].nameid <= 0 || mob->dropitem[i].p < 1 || (item_data = itemdb_search(mob->dropitem[i].nameid)) == NULL)
 				continue;
-			if (mob->dropitem[i].p > 0) {
+			if (item_data->slot)
+				sprintf(atcmd_output2, " - %s[%d]  %02.02f%%", item_data->jname, item_data->slot, (float)mob->dropitem[i].p / 100);
+			else
 				sprintf(atcmd_output2, " - %s  %02.02f%%", item_data->jname, (float)mob->dropitem[i].p / 100);
-				strcat(atcmd_output, atcmd_output2);
-				if (++j % 3 == 0) {
-					clif_displaymessage(fd, atcmd_output);
-					strcpy(atcmd_output, " ");
-				}
+			strcat(atcmd_output, atcmd_output2);
+			if (++j % 3 == 0) {
+				clif_displaymessage(fd, atcmd_output);
+				strcpy(atcmd_output, " ");
 			}
 		}
 		if (j == 0)