diff --git a/src/main/java/net/minecraft/server/CrashReport.java b/src/main/java/net/minecraft/server/CrashReport.java
index a9e83166c0..42110c3abb 100644
--- a/src/main/java/net/minecraft/server/CrashReport.java
+++ b/src/main/java/net/minecraft/server/CrashReport.java
@@ -35,6 +35,7 @@ public class CrashReport {
         this.a("Java VM Version", (Callable) (new CrashReportJavaVMVersion(this)));
         this.a("Memory", (Callable) (new CrashReportMemory(this)));
         this.a("JVM Flags", (Callable) (new CrashReportJVMFlags(this)));
+        this.a("CraftBukkit Information", (Callable) (new org.bukkit.craftbukkit.CraftCrashReport())); // CraftBukkit
     }
 
     public void a(String s, Callable callable) {
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftCrashReport.java b/src/main/java/org/bukkit/craftbukkit/CraftCrashReport.java
new file mode 100644
index 0000000000..72938bbb5b
--- /dev/null
+++ b/src/main/java/org/bukkit/craftbukkit/CraftCrashReport.java
@@ -0,0 +1,41 @@
+package org.bukkit.craftbukkit;
+
+import java.io.PrintWriter;
+import java.io.StringWriter;
+import java.util.Arrays;
+import java.util.Map;
+import java.util.concurrent.Callable;
+
+import org.bukkit.Bukkit;
+import org.bukkit.plugin.Plugin;
+import org.bukkit.plugin.PluginDescriptionFile;
+
+import net.minecraft.server.MinecraftServer;
+
+public class CraftCrashReport implements Callable {
+
+    public Object call() throws Exception {
+        StringWriter value = new StringWriter();
+        try {
+            value.append("\n   Running: ").append(Bukkit.getName()).append(" version ").append(Bukkit.getVersion()).append(" (Implementing API version ").append(Bukkit.getBukkitVersion()).append(") ").append(String.valueOf(MinecraftServer.getServer().getOnlineMode()));
+            value.append("\n   Plugins: {");
+            for (Plugin plugin : Bukkit.getPluginManager().getPlugins()) {
+                PluginDescriptionFile description = plugin.getDescription();
+                value.append(' ').append(description.getFullName()).append(' ').append(description.getMain()).append(' ').append(Arrays.toString(description.getAuthors().toArray())).append(',');
+            }
+            value.append("}\n   Warnings: ").append(Bukkit.getWarningState().name());
+            value.append("\n   Threads: {");
+            for (Map.Entry<Thread, ? extends Object[]> entry : Thread.getAllStackTraces().entrySet()) {
+                value.append(' ').append(entry.getKey().getState().name()).append(' ').append(entry.getKey().getName()).append(": ").append(Arrays.toString(entry.getValue())).append(',');
+            }
+            value.append('}');
+        } catch (Throwable t) {
+            value.append("\n   Failed to handle CraftCrashReport:\n");
+            PrintWriter writer = new PrintWriter(value);
+            t.printStackTrace(writer);
+            writer.flush();
+        }
+        return value.toString();
+    }
+
+}