diff --git a/src/main/java/net/minecraft/server/PlayerAbilities.java b/src/main/java/net/minecraft/server/PlayerAbilities.java
index e79ffb5882..5ce83ddaee 100644
--- a/src/main/java/net/minecraft/server/PlayerAbilities.java
+++ b/src/main/java/net/minecraft/server/PlayerAbilities.java
@@ -7,8 +7,8 @@ public class PlayerAbilities {
     public boolean canFly = false;
     public boolean canInstantlyBuild = false;
     public boolean mayBuild = true;
-    private float flySpeed = 0.05F;
-    private float walkSpeed = 0.1F;
+    public float flySpeed = 0.05F; // CraftBukkit private -> public
+    public float walkSpeed = 0.1F; // CraftBukkit private -> public
 
     public PlayerAbilities() {}
 
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
index b1906046a4..bb7e50697c 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
@@ -864,4 +864,39 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
             return getHandle().noDamageTicks;
         }
     }
+
+    public void setFlySpeed(float value) {
+        validateSpeed(value);
+        EntityPlayer player = getHandle();
+        player.abilities.flySpeed = value / 2f;
+        player.updateAbilities();
+
+    }
+
+    public void setWalkSpeed(float value) {
+        validateSpeed(value);
+        EntityPlayer player = getHandle();
+        player.abilities.walkSpeed = value / 2f;
+        player.updateAbilities();
+    }
+
+    public float getFlySpeed() {
+        return getHandle().abilities.flySpeed * 2f;
+    }
+
+    public float getWalkSpeed() {
+        return getHandle().abilities.walkSpeed * 2f;
+    }
+
+    private void validateSpeed(float value) {
+        if (value < 0) {
+            if (value < -1f) {
+                throw new IllegalArgumentException(value + " is too low");
+            }
+        } else {
+            if (value > 1f) {
+                throw new IllegalArgumentException(value + " is too high");
+            }
+        }
+    }
 }