diff --git a/CraftBukkit-Patches/0043-Remove-o-Option.patch b/CraftBukkit-Patches/0043-Remove-o-Option.patch
new file mode 100644
index 0000000000..cb91bd6a4e
--- /dev/null
+++ b/CraftBukkit-Patches/0043-Remove-o-Option.patch
@@ -0,0 +1,23 @@
+From ce31e09b9032e1abe136f424ee7800c5c3c70227 Mon Sep 17 00:00:00 2001
+From: md_5 <md_5@live.com.au>
+Date: Sun, 19 May 2013 18:29:48 +1000
+Subject: [PATCH] Remove -o Option
+
+Serves no purpose other than to confuse users.
+
+diff --git a/src/main/java/net/minecraft/server/PropertyManager.java b/src/main/java/net/minecraft/server/PropertyManager.java
+index 03aa219..a45c4ea 100644
+--- a/src/main/java/net/minecraft/server/PropertyManager.java
++++ b/src/main/java/net/minecraft/server/PropertyManager.java
+@@ -53,7 +53,7 @@ public class PropertyManager {
+     }
+ 
+     private <T> T getOverride(String name, T value) {
+-        if ((this.options != null) && (this.options.has(name))) {
++        if ((this.options != null) && (this.options.has(name)) && !name.equals( "online-mode")) { // Spigot
+             return (T) this.options.valueOf(name);
+         }
+ 
+-- 
+1.8.2.1
+