diff --git a/src/main/java/org/spacehq/mc/protocol/data/game/values/MagicValues.java b/src/main/java/org/spacehq/mc/protocol/data/game/values/MagicValues.java
index ed6422db..6a8d9c6f 100644
--- a/src/main/java/org/spacehq/mc/protocol/data/game/values/MagicValues.java
+++ b/src/main/java/org/spacehq/mc/protocol/data/game/values/MagicValues.java
@@ -77,6 +77,7 @@ public class MagicValues {
         register(AttributeType.KNOCKBACK_RESISTANCE, "generic.knockbackResistance");
         register(AttributeType.MOVEMENT_SPEED, "generic.movementSpeed");
         register(AttributeType.ATTACK_DAMAGE, "generic.attackDamage");
+        register(AttributeType.ATTACK_SPEED, "generic.attackSpeed");
         register(AttributeType.HORSE_JUMP_STRENGTH, "horse.jumpStrength");
         register(AttributeType.ZOMBIE_SPAWN_REINFORCEMENTS_CHANCE, "zombie.spawnReinforcements");
 
diff --git a/src/main/java/org/spacehq/mc/protocol/data/game/values/entity/AttributeType.java b/src/main/java/org/spacehq/mc/protocol/data/game/values/entity/AttributeType.java
index 10ad13ae..c7f1d09f 100644
--- a/src/main/java/org/spacehq/mc/protocol/data/game/values/entity/AttributeType.java
+++ b/src/main/java/org/spacehq/mc/protocol/data/game/values/entity/AttributeType.java
@@ -2,11 +2,12 @@ package org.spacehq.mc.protocol.data.game.values.entity;
 
 public enum AttributeType {
 
-    MAX_HEALTH(20, 0, Double.MAX_VALUE),
+    MAX_HEALTH(20, 0, 1024),
     FOLLOW_RANGE(32, 0, 2048),
     KNOCKBACK_RESISTANCE(0, 0, 1),
-    MOVEMENT_SPEED(0.699999988079071, 0, Double.MAX_VALUE),
-    ATTACK_DAMAGE(2, 0, Double.MAX_VALUE),
+    MOVEMENT_SPEED(0.699999988079071, 0, 1024),
+    ATTACK_DAMAGE(2, 0, 2048),
+    ATTACK_SPEED(4, 0, 1024),
     HORSE_JUMP_STRENGTH(0.7, 0, 2),
     ZOMBIE_SPAWN_REINFORCEMENTS_CHANCE(0, 0, 1);