diff --git a/api/src/main/java/net/md_5/bungee/api/plugin/PluginManager.java b/api/src/main/java/net/md_5/bungee/api/plugin/PluginManager.java
index a8b21559ec..6c3b0b6b46 100644
--- a/api/src/main/java/net/md_5/bungee/api/plugin/PluginManager.java
+++ b/api/src/main/java/net/md_5/bungee/api/plugin/PluginManager.java
@@ -23,6 +23,8 @@
 import java.util.Map;
 import java.util.Set;
 import java.util.Stack;
+import java.util.concurrent.locks.ReadWriteLock;
+import java.util.concurrent.locks.ReentrantReadWriteLock;
 import java.util.jar.JarEntry;
 import java.util.jar.JarFile;
 import java.util.logging.Level;
@@ -59,6 +61,8 @@ public final class PluginManager
     private final Multimap<Plugin, Command> commandsByPlugin = ArrayListMultimap.create();
     private final Multimap<Plugin, Listener> listenersByPlugin = ArrayListMultimap.create();
 
+    private final ReadWriteLock lock = new ReentrantReadWriteLock();
+
     @SuppressWarnings("unchecked")
     public PluginManager(ProxyServer proxy)
     {
@@ -93,12 +97,19 @@ public PluginManager(ProxyServer proxy)
      */
     public void registerCommand(Plugin plugin, Command command)
     {
-        commandMap.put( command.getName().toLowerCase( Locale.ROOT ), command );
-        for ( String alias : command.getAliases() )
+        lock.writeLock().lock();
+        try
+        {
+            commandMap.put( command.getName().toLowerCase( Locale.ROOT ), command );
+            for ( String alias : command.getAliases() )
+            {
+                commandMap.put( alias.toLowerCase( Locale.ROOT ), command );
+            }
+            commandsByPlugin.put( plugin, command );
+        } finally
         {
-            commandMap.put( alias.toLowerCase( Locale.ROOT ), command );
+            lock.writeLock().unlock();
         }
-        commandsByPlugin.put( plugin, command );
     }
 
     /**
@@ -108,8 +119,15 @@ public void registerCommand(Plugin plugin, Command command)
      */
     public void unregisterCommand(Command command)
     {
-        while ( commandMap.values().remove( command ) );
-        commandsByPlugin.values().remove( command );
+        lock.writeLock().lock();
+        try
+        {
+            while ( commandMap.values().remove( command ) );
+            commandsByPlugin.values().remove( command );
+        } finally
+        {
+            lock.writeLock().unlock();
+        }
     }
 
     /**
@@ -119,11 +137,18 @@ public void unregisterCommand(Command command)
      */
     public void unregisterCommands(Plugin plugin)
     {
-        for ( Iterator<Command> it = commandsByPlugin.get( plugin ).iterator(); it.hasNext(); )
+        lock.writeLock().lock();
+        try
         {
-            Command command = it.next();
-            while ( commandMap.values().remove( command ) );
-            it.remove();
+            for ( Iterator<Command> it = commandsByPlugin.get( plugin ).iterator(); it.hasNext(); )
+            {
+                Command command = it.next();
+                while ( commandMap.values().remove( command ) );
+                it.remove();
+            }
+        } finally
+        {
+            lock.writeLock().unlock();
         }
     }
 
@@ -137,7 +162,14 @@ private Command getCommandIfEnabled(String commandName, CommandSender sender)
             return null;
         }
 
-        return commandMap.get( commandLower );
+        lock.readLock().lock();
+        try
+        {
+            return commandMap.get( commandLower );
+        } finally
+        {
+            lock.readLock().unlock();
+        }
     }
 
     /**
@@ -434,13 +466,20 @@ public <T extends Event> T callEvent(T event)
      */
     public void registerListener(Plugin plugin, Listener listener)
     {
-        for ( Method method : listener.getClass().getDeclaredMethods() )
+        lock.writeLock().lock();
+        try
         {
-            Preconditions.checkArgument( !method.isAnnotationPresent( Subscribe.class ),
+            for ( Method method : listener.getClass().getDeclaredMethods() )
+            {
+                Preconditions.checkArgument( !method.isAnnotationPresent( Subscribe.class ),
                     "Listener %s has registered using deprecated subscribe annotation! Please update to @EventHandler.", listener );
+            }
+            eventBus.register( listener );
+            listenersByPlugin.put( plugin, listener );
+        } finally
+        {
+            lock.writeLock().unlock();
         }
-        eventBus.register( listener );
-        listenersByPlugin.put( plugin, listener );
     }
 
     /**
@@ -450,8 +489,15 @@ public void registerListener(Plugin plugin, Listener listener)
      */
     public void unregisterListener(Listener listener)
     {
-        eventBus.unregister( listener );
-        listenersByPlugin.values().remove( listener );
+        lock.writeLock().lock();
+        try
+        {
+            eventBus.unregister( listener );
+            listenersByPlugin.values().remove( listener );
+        } finally
+        {
+            lock.writeLock().unlock();
+        }
     }
 
     /**
@@ -461,10 +507,17 @@ public void unregisterListener(Listener listener)
      */
     public void unregisterListeners(Plugin plugin)
     {
-        for ( Iterator<Listener> it = listenersByPlugin.get( plugin ).iterator(); it.hasNext(); )
+        lock.writeLock().lock();
+        try
+        {
+            for ( Iterator<Listener> it = listenersByPlugin.get( plugin ).iterator(); it.hasNext(); )
+            {
+                eventBus.unregister( it.next() );
+                it.remove();
+            }
+        } finally
         {
-            eventBus.unregister( it.next() );
-            it.remove();
+            lock.writeLock().unlock();
         }
     }
 
@@ -475,7 +528,14 @@ public void unregisterListeners(Plugin plugin)
      */
     public Collection<Map.Entry<String, Command>> getCommands()
     {
-        return Collections.unmodifiableCollection( commandMap.entrySet() );
+        lock.readLock().lock();
+        try
+        {
+            return Collections.unmodifiableCollection( commandMap.entrySet() );
+        } finally
+        {
+            lock.readLock().unlock();
+        }
     }
 
     boolean isTransitiveDepend(PluginDescription plugin, PluginDescription depend)