diff --git a/doc/atcommands.txt b/doc/atcommands.txt
index 2f43be7893..106f0a09a5 100644
--- a/doc/atcommands.txt
+++ b/doc/atcommands.txt
@@ -3,7 +3,7 @@
 //===== By: ==================================================
 //= rAthena Dev Team
 //===== Last Updated: ========================================
-//= 20140126
+//= 20140211
 //===== Description: =========================================
 //= List of available atcommands and their functions.
 //============================================================
@@ -923,10 +923,10 @@ Summons the specified amount of spirit spheres around you.
 
 ---------------------------------------
 
-@mount
+@mount {<dragon color 1-5>}
 @mount2
 
-Toggles mounting/unmounting a peco (@mount) or cash mount (@mount2).
+Toggles mounting/unmounting a job mount (@mount) or cash mount (@mount2).
 
 ---------------------------------------
 
diff --git a/doc/script_commands.txt b/doc/script_commands.txt
index 732c217bb7..b0bf8e3032 100644
--- a/doc/script_commands.txt
+++ b/doc/script_commands.txt
@@ -2904,7 +2904,7 @@ Example:
 
 *getguildmember <guild id>{,<type>};
 
-This command will find all members of a specified guildand returns their names 
+This command will find all members of a specified guild and returns their names 
 (or character id or account id depending on the value of "type") into an array
 of temporary global variables.
 
diff --git a/src/map/atcommand.c b/src/map/atcommand.c
index bed3bc8980..2f867a734c 100644
--- a/src/map/atcommand.c
+++ b/src/map/atcommand.c
@@ -4074,12 +4074,21 @@ ACMD_FUNC(mount_peco)
 	}
 
 	if( (sd->class_&MAPID_THIRDMASK) == MAPID_RUNE_KNIGHT && pc_checkskill(sd,RK_DRAGONTRAINING) > 0 ) {
-		if( !(sd->sc.option&OPTION_DRAGON1) ) {
+		if( !(sd->sc.option&OPTION_DRAGON) ) {
+			unsigned int option = OPTION_DRAGON1;
+			if( message[0] ) {
+				int color = atoi(message);
+				option = ( color == 2 ? OPTION_DRAGON2 :
+				           color == 3 ? OPTION_DRAGON3 :
+				           color == 4 ? OPTION_DRAGON4 :
+				           color == 5 ? OPTION_DRAGON5 :
+				                        OPTION_DRAGON1 );
+			}
 			clif_displaymessage(sd->fd,msg_txt(sd,1119)); // You have mounted your Dragon.
-			pc_setoption(sd, sd->sc.option|OPTION_DRAGON1);
+			pc_setoption(sd, sd->sc.option|option);
 		} else {
 			clif_displaymessage(sd->fd,msg_txt(sd,1120)); // You have released your Dragon.
-			pc_setoption(sd, sd->sc.option&~OPTION_DRAGON1);
+			pc_setoption(sd, sd->sc.option&~OPTION_DRAGON);
 		}
 		return 0;
 	}