diff --git a/src/main/java/org/bukkit/World.java b/src/main/java/org/bukkit/World.java
index e53c1f12..ab4166ac 100644
--- a/src/main/java/org/bukkit/World.java
+++ b/src/main/java/org/bukkit/World.java
@@ -306,6 +306,14 @@ public interface World {
      * @return Resulting LivingEntity of this method, or null if it was unsuccessful
      */
     public LivingEntity spawnCreature(Location loc, CreatureType type);
+    
+    /**
+     * Strikes lightning at the given {@link Location}
+     * 
+     * @param loc The location to strike lightning
+     * @return
+     */
+    public LightningStrike strikeLightning(Location loc);
 
     /**
      * Get a list of all entities in this World
diff --git a/src/main/java/org/bukkit/entity/LightningStrike.java b/src/main/java/org/bukkit/entity/LightningStrike.java
new file mode 100644
index 00000000..5ffd137f
--- /dev/null
+++ b/src/main/java/org/bukkit/entity/LightningStrike.java
@@ -0,0 +1,9 @@
+
+package org.bukkit.entity;
+
+/**
+ * Represents an instance of a lightning strike entity
+ */
+public interface LightningStrike extends Weather {
+
+}
diff --git a/src/main/java/org/bukkit/entity/WeatherStorm.java b/src/main/java/org/bukkit/entity/WeatherStorm.java
deleted file mode 100644
index 2dc27a69..00000000
--- a/src/main/java/org/bukkit/entity/WeatherStorm.java
+++ /dev/null
@@ -1,9 +0,0 @@
-
-package org.bukkit.entity;
-
-/**
- * Represents an instance of a weather storm entity
- */
-public interface WeatherStorm extends Weather {
-
-}