diff --git a/src/protocol/inspircd12.c b/src/protocol/inspircd12.c
index 68a81bc09..86456c448 100644
--- a/src/protocol/inspircd12.c
+++ b/src/protocol/inspircd12.c
@@ -1293,10 +1293,14 @@ void inspircd_cmd_svso(char *source, char *nick, char *flag)
 /* NICK <newnick>  */
 void inspircd_cmd_chg_nick(char *oldnick, char *newnick)
 {
+    Uid *ud;
     if (!oldnick || !newnick)
         return;
+    ud = find_uid(oldnick);
+    if (!ud)
+        ud = find_uid(newnick);
 
-    send_cmd(oldnick, "NICK %s", newnick);
+    send_cmd(ud ? ud->uid : oldnick, "NICK %s %ld", newnick, time(NULL));
 }
 
 /* SVSNICK */
diff --git a/version.log b/version.log
index e367541a2..8b582a26f 100644
--- a/version.log
+++ b/version.log
@@ -9,9 +9,10 @@ VERSION_MAJOR="1"
 VERSION_MINOR="8"
 VERSION_PATCH="2"
 VERSION_EXTRA="-svn"
-VERSION_BUILD="2543"
+VERSION_BUILD="2544"
 
 # $Log$ # Changes since 1.8.2 Release
+#Revision 2544 - Fixed the NICK command syntax on InspIRCd 1.2 to work when changing clients nicknames
 #Revision 2543 - Fixed crash when juping servers on InspIRCd 1.2
 #Revision 2542 - Fixed remote whoises on services clients on InspIRCd 1.2
 #Revision 2537 - Added InspIRCd 1.2 protocol module into Windows makefiles and installer scripts