diff --git a/Essentials/src/com/earth2me/essentials/commands/Commandtppos.java b/Essentials/src/com/earth2me/essentials/commands/Commandtppos.java
index 0786f9cb9..ce7c369e4 100644
--- a/Essentials/src/com/earth2me/essentials/commands/Commandtppos.java
+++ b/Essentials/src/com/earth2me/essentials/commands/Commandtppos.java
@@ -26,6 +26,12 @@ public class Commandtppos extends EssentialsCommand
 		int y = Integer.parseInt(args[1]);
 		int z = Integer.parseInt(args[2]);
 		Location l = new Location(user.getWorld(), x, y, z);
+		if (args.length > 3) {
+			l.setYaw(Float.parseFloat(args[3]));
+		}
+		if (args.length > 4) {
+			l.setPitch(Float.parseFloat(args[4]));
+		}
 		Trade charge = new Trade(this.getName(), ess);
 		charge.isAffordableFor(user);
 		user.sendMessage(Util.i18n("teleporting"));
diff --git a/Essentials/src/plugin.yml b/Essentials/src/plugin.yml
index 2090e8484..24049354c 100644
--- a/Essentials/src/plugin.yml
+++ b/Essentials/src/plugin.yml
@@ -330,7 +330,7 @@ commands:
     usage: /<command> <player>
   tppos:
     description: Teleport to coordinates.
-    usage: /<command> <x> <y> <z>
+    usage: /<command> <x> <y> <z> [yaw] [pitch]
   tptoggle:
     description: Blocks all forms of teleportation.
     usage: /<command>