diff --git a/scm-core/src/main/java/sonia/scm/event/ScmEventBus.java b/scm-core/src/main/java/sonia/scm/event/ScmEventBus.java
index 4d884185eb..2546bed6ce 100644
--- a/scm-core/src/main/java/sonia/scm/event/ScmEventBus.java
+++ b/scm-core/src/main/java/sonia/scm/event/ScmEventBus.java
@@ -131,13 +131,22 @@ public abstract class ScmEventBus
   public abstract void unregister(Object subscriber);
 
   /**
-   * This method is the same as {@code register(subscriber, true)}.
-   *
+   * Calls the {@link #register(Object, boolean)} method, after reading the
+   * value of {@link Subscriber#async()}. If the {@link Subscriber} annotation
+   * is not present than the object is registered as async.
    *
    * @param subscriber subscriber object
    */
   public void register(Object subscriber)
   {
-    register(subscriber, true);
+    boolean async = true;
+    Subscriber a = subscriber.getClass().getAnnotation(Subscriber.class);
+
+    if (a != null)
+    {
+      async = a.async();
+    }
+
+    register(subscriber, async);
   }
 }
diff --git a/scm-core/src/test/java/sonia/scm/event/ScmEventBusTest.java b/scm-core/src/test/java/sonia/scm/event/ScmEventBusTest.java
new file mode 100644
index 0000000000..55ef93b0ea
--- /dev/null
+++ b/scm-core/src/test/java/sonia/scm/event/ScmEventBusTest.java
@@ -0,0 +1,142 @@
+/**
+ * Copyright (c) 2010, Sebastian Sdorra All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright notice,
+ * this list of conditions and the following disclaimer. 2. Redistributions in
+ * binary form must reproduce the above copyright notice, this list of
+ * conditions and the following disclaimer in the documentation and/or other
+ * materials provided with the distribution. 3. Neither the name of SCM-Manager;
+ * nor the names of its contributors may be used to endorse or promote products
+ * derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE FOR
+ * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+ * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+ * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ * http://bitbucket.org/sdorra/scm-manager
+ *
+ */
+
+
+
+package sonia.scm.event;
+
+//~--- non-JDK imports --------------------------------------------------------
+
+import org.junit.Test;
+
+import static org.junit.Assert.*;
+
+/**
+ *
+ * @author Sebastian Sdorra
+ */
+public class ScmEventBusTest
+{
+
+  /**
+   * Method description
+   *
+   */
+  @Test
+  public void testRegister()
+  {
+    TestScmEventBus eventBus = new TestScmEventBus();
+
+    eventBus.register(new Object());
+    assertTrue(eventBus.async);
+    eventBus.register(new TestAsyncSubscriber());
+    assertTrue(eventBus.async);
+    eventBus.register(new TestSynchronousSubscriber());
+    assertFalse(eventBus.async);
+  }
+
+  //~--- inner classes --------------------------------------------------------
+
+  /**
+   * Class description
+   *
+   *
+   * @version        Enter version here..., 13/02/17
+   * @author         Enter your name here...
+   */
+  @Subscriber(async = true)
+  private static class TestAsyncSubscriber {}
+
+
+  /**
+   * Class description
+   *
+   *
+   * @version        Enter version here..., 13/02/17
+   * @author         Enter your name here...
+   */
+  private static class TestScmEventBus extends ScmEventBus
+  {
+
+    /**
+     * Method description
+     *
+     *
+     * @param event
+     */
+    @Override
+    public void post(Object event)
+    {
+
+      // do nothing
+    }
+
+    /**
+     * Method description
+     *
+     *
+     * @param subscriber
+     * @param async
+     */
+    @Override
+    public void register(Object subscriber, boolean async)
+    {
+      this.async = async;
+    }
+
+    /**
+     * Method description
+     *
+     *
+     * @param subscriber
+     */
+    @Override
+    public void unregister(Object subscriber)
+    {
+
+      // do nothing
+    }
+
+    //~--- fields -------------------------------------------------------------
+
+    /** Field description */
+    boolean async;
+  }
+
+
+  /**
+   * Class description
+   *
+   *
+   * @version        Enter version here..., 13/02/17
+   * @author         Enter your name here...
+   */
+  @Subscriber(async = false)
+  private static class TestSynchronousSubscriber {}
+}