diff --git a/CraftBukkit-Patches/0027-Allow-Disabling-of-Command-Logging.patch b/CraftBukkit-Patches/0027-Allow-Disabling-of-Command-Logging.patch
index 662403ac6..3b1e99d08 100644
--- a/CraftBukkit-Patches/0027-Allow-Disabling-of-Command-Logging.patch
+++ b/CraftBukkit-Patches/0027-Allow-Disabling-of-Command-Logging.patch
@@ -31,6 +31,4 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 +        logCommands = getBoolean( "commands.log", true );
 +    }
  }
--- 
-1.9.0.msysgit.0
-
+--
\ No newline at end of file
diff --git a/CraftBukkit-Patches/0118-Configurable-save-on-stop-only-for-UserCache.patch b/CraftBukkit-Patches/0118-Configurable-save-on-stop-only-for-UserCache.patch
index d63f5d474..627a1a40b 100644
--- a/CraftBukkit-Patches/0118-Configurable-save-on-stop-only-for-UserCache.patch
+++ b/CraftBukkit-Patches/0118-Configurable-save-on-stop-only-for-UserCache.patch
@@ -27,6 +27,15 @@ diff --git a/src/main/java/net/minecraft/server/UserCache.java b/src/main/java/n
 index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
 --- a/src/main/java/net/minecraft/server/UserCache.java
 +++ b/src/main/java/net/minecraft/server/UserCache.java
+@@ -0,0 +0,0 @@ public class UserCache {
+         this.c.put(gameprofile.getName().toLowerCase(Locale.ROOT), usercache_usercacheentry);
+         this.d.put(uuid, usercache_usercacheentry);
+         this.e.addFirst(gameprofile);
+-        this.c();
++        if( !org.spigotmc.SpigotConfig.saveUserCacheOnStopOnly ) this.c(); // Spigot - skip saving if disabled
+     }
+ 
+     public GameProfile getProfile(String s) {
 @@ -0,0 +0,0 @@ public class UserCache {
              }
          }