diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
index f6839116ea..357476ed3d 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
@@ -571,4 +571,27 @@ public class CraftWorld implements World {
     public void setWeatherDuration(int duration) {
         world.worldData.c(duration);
     }
+
+    public boolean isThundering() {
+        return world.worldData.j();
+    }
+
+    public void setThundering(boolean thundering) {
+        world.worldData.a(thundering);
+        
+        // These numbers are from Minecraft
+        if (thundering) {
+            setThunderDuration(rand.nextInt(12000) + 3600);
+        } else {
+            setThunderDuration(rand.nextInt(168000) + 12000);
+        }
+    }
+    
+    public int getThunderDuration() {
+        return world.worldData.k();
+    }
+
+    public void setThunderDuration(int duration) {
+        world.worldData.b(duration);        
+    }
 }