diff --git a/changelog.txt b/changelog.txt
index a84b822bf..fe471b367 100644
--- a/changelog.txt
+++ b/changelog.txt
@@ -2,6 +2,8 @@ EQEMu Changelog (Started on Sept 24, 2003 15:50)
 -------------------------------------------------------
 == 01/13/2015 ==
 Uleat: Placed an upper limit on the cursor queue save loop.
+Trevius: (RoF2) Guild invites now add new members as members instead of recruits, and /guild chat works properly.
+Trevius: (RoF2) Guild Promote is now functional.
 
 == 01/12/2015 ==
 Uleat: Fix for OP_FormattedMessage text link server crashes
diff --git a/utils/patches/patch_RoF2.conf b/utils/patches/patch_RoF2.conf
index 23bec152e..7159dcce5 100644
--- a/utils/patches/patch_RoF2.conf
+++ b/utils/patches/patch_RoF2.conf
@@ -126,7 +126,7 @@ OP_GuildLeader=0x7e09
 OP_GuildDelete=0x3708
 OP_GuildInviteAccept=0x7053
 OP_GuildDemote=0x2d4e
-OP_GuildPromote=0x0000
+OP_GuildPromote=0x6a98
 OP_GuildPublicNote=0x5053
 OP_GuildManageBanker=0x748f
 OP_GuildBank=0x5134
diff --git a/zone/client_packet.cpp b/zone/client_packet.cpp
index 8b82d84db..734d82de5 100644
--- a/zone/client_packet.cpp
+++ b/zone/client_packet.cpp
@@ -7489,7 +7489,7 @@ void Client::Handle_OP_GuildInviteAccept(const EQApplicationPacket *app)
 
 			uint32 guildrank = gj->response;
 
-			if (GetClientVersion() == EQClientRoF)
+			if (GetClientVersion() >= EQClientRoF)
 			{
 				if (gj->response == 8)
 				{
@@ -7668,7 +7668,10 @@ void Client::Handle_OP_GuildPromote(const EQApplicationPacket *app)
 		uint8 rank = gci.rank + 1;
 
 		if (rank > GUILD_OFFICER)
+		{
+			Message(0, "You cannot promote someone to be guild leader. You must use /guildleader.");
 			return;
+		}
 
 
 		mlog(GUILDS__ACTIONS, "Promoting %s (%d) from rank %s (%d) to %s (%d) in %s (%d)",