diff --git a/changelog.txt b/changelog.txt
index 4db0256cc..e23ef39c9 100644
--- a/changelog.txt
+++ b/changelog.txt
@@ -9,7 +9,7 @@ Athrogate: Adding ClearCompassMark() to Lua.
 	- Lua didn't have ClearCompassMark().  Perl already had this.
 
 == 01/12/2016 ==
-Uleat: Fix for tradeskill containers remaining locked after a RoF+ client leaves. Intermediary fix for RoF+ clients accessing tradeskill containers when in use by another player.
+Uleat: Fix for tradeskill containers remaining locked after a RoF+ client leaves. Intermediary fix for RoF+ clients accessing tradeskill containers when in use by another player (thanks Natedog!)
 
 == 12/29/2015 ==
 Akkadius: Implemented standardized zone controller scripts (Rule Zone, UseZoneController) Defaulted to true
diff --git a/zone/command.cpp b/zone/command.cpp
index 8d4df2b46..4c25b25d2 100644
--- a/zone/command.cpp
+++ b/zone/command.cpp
@@ -5484,36 +5484,54 @@ void command_interrupt(Client *c, const Seperator *sep)
 
 void command_summonitem(Client *c, const Seperator *sep)
 {
-	if (!sep->IsNumber(1))
-		c->Message(0, "Usage: #summonitem [item id] [charges], charges are optional");
-	else {
-		uint32 itemid = atoi(sep->arg[1]);
-		int16 item_status = 0;
-		const Item_Struct* item = database.GetItem(itemid);
-		if(item) {
-			item_status = static_cast<int16>(item->MinStatus);
-		}
+	uint32 itemid = 0;
 
-		if (item_status > c->Admin())
-			c->Message(13, "Error: Insufficient status to summon this item.");
-		else if (sep->argnum==2 && sep->IsNumber(2))
-			c->SummonItem(itemid, atoi(sep->arg[2]));
-		else if (sep->argnum==3)
-			c->SummonItem(itemid, atoi(sep->arg[2]), atoi(sep->arg[3]));
-		else if (sep->argnum==4)
-			c->SummonItem(itemid, atoi(sep->arg[2]), atoi(sep->arg[3]), atoi(sep->arg[4]));
-		else if (sep->argnum==5)
-			c->SummonItem(itemid, atoi(sep->arg[2]), atoi(sep->arg[3]), atoi(sep->arg[4]), atoi(sep->arg[5]));
-		else if (sep->argnum==6)
-			c->SummonItem(itemid, atoi(sep->arg[2]), atoi(sep->arg[3]), atoi(sep->arg[4]), atoi(sep->arg[5]), atoi(sep->arg[6]));
-		else if (sep->argnum==7)
-			c->SummonItem(itemid, atoi(sep->arg[2]), atoi(sep->arg[3]), atoi(sep->arg[4]), atoi(sep->arg[5]), atoi(sep->arg[6]), atoi(sep->arg[7]));
-		else if (sep->argnum==8)
-			c->SummonItem(itemid, atoi(sep->arg[2]), atoi(sep->arg[3]), atoi(sep->arg[4]), atoi(sep->arg[5]), atoi(sep->arg[6]), atoi(sep->arg[7]), atoi(sep->arg[8]));
-		else {
-			c->SummonItem(itemid);
-		}
+	std::string cmd_msg = sep->msg;
+	size_t link_open = cmd_msg.find('\x12');
+	size_t link_close = cmd_msg.find_last_of('\x12');
+	if (link_open != link_close && (cmd_msg.length() - link_open) > EmuConstants::TEXT_LINK_BODY_LENGTH) {
+		TextLinkBody_Struct link_body;
+		Client::TextLink::DegenerateLinkBody(link_body, cmd_msg.substr(link_open + 1, EmuConstants::TEXT_LINK_BODY_LENGTH));
+		itemid = link_body.item_id;
 	}
+	else if (!sep->IsNumber(1)) {
+		c->Message(0, "Usage: #summonitem [item id | link] [charges], charges are optional");
+		return;
+	}
+	else {
+		itemid = atoi(sep->arg[1]);
+	}
+	if (!itemid) {
+		c->Message(0, "A valid item id number is required (derived: 0)");
+		return;
+	}
+
+	int16 item_status = 0;
+	const Item_Struct* item = database.GetItem(itemid);
+	if (item) {
+		item_status = static_cast<int16>(item->MinStatus);
+	}
+
+	if (item_status > c->Admin())
+		c->Message(13, "Error: Insufficient status to summon this item.");
+	else if (sep->argnum == 2 && sep->IsNumber(2))
+		c->SummonItem(itemid, atoi(sep->arg[2]));
+	else if (sep->argnum == 3)
+		c->SummonItem(itemid, atoi(sep->arg[2]), atoi(sep->arg[3]));
+	else if (sep->argnum == 4)
+		c->SummonItem(itemid, atoi(sep->arg[2]), atoi(sep->arg[3]), atoi(sep->arg[4]));
+	else if (sep->argnum == 5)
+		c->SummonItem(itemid, atoi(sep->arg[2]), atoi(sep->arg[3]), atoi(sep->arg[4]), atoi(sep->arg[5]));
+	else if (sep->argnum == 6)
+		c->SummonItem(itemid, atoi(sep->arg[2]), atoi(sep->arg[3]), atoi(sep->arg[4]), atoi(sep->arg[5]), atoi(sep->arg[6]));
+	else if (sep->argnum == 7)
+		c->SummonItem(itemid, atoi(sep->arg[2]), atoi(sep->arg[3]), atoi(sep->arg[4]), atoi(sep->arg[5]), atoi(sep->arg[6]), atoi(sep->arg[7]));
+	else if (sep->argnum == 8)
+		c->SummonItem(itemid, atoi(sep->arg[2]), atoi(sep->arg[3]), atoi(sep->arg[4]), atoi(sep->arg[5]), atoi(sep->arg[6]), atoi(sep->arg[7]), atoi(sep->arg[8]));
+	else {
+		c->SummonItem(itemid);
+	}
+	
 }
 
 void command_giveitem(Client *c, const Seperator *sep)