diff --git a/apps/vtn/vtnrsc/src/main/java/org/onosproject/vtnrsc/portchain/impl/PortChainManager.java b/apps/vtn/vtnrsc/src/main/java/org/onosproject/vtnrsc/portchain/impl/PortChainManager.java
index 0062db4..1e6f21a 100644
--- a/apps/vtn/vtnrsc/src/main/java/org/onosproject/vtnrsc/portchain/impl/PortChainManager.java
+++ b/apps/vtn/vtnrsc/src/main/java/org/onosproject/vtnrsc/portchain/impl/PortChainManager.java
@@ -30,6 +30,8 @@
 import org.onosproject.event.AbstractListenerManager;
 import org.onosproject.store.serializers.KryoNamespaces;
 import org.onosproject.store.service.EventuallyConsistentMap;
+import org.onosproject.store.service.EventuallyConsistentMapEvent;
+import org.onosproject.store.service.EventuallyConsistentMapListener;
 import org.onosproject.store.service.MultiValuedTimestamp;
 import org.onosproject.store.service.StorageService;
 import org.onosproject.store.service.WallClockTimestamp;
@@ -50,17 +52,22 @@
 
     private static final String PORT_CHAIN_ID_NULL = "PortChain ID cannot be null";
     private static final String PORT_CHAIN_NULL = "PortChain cannot be null";
-    private static final String LISTENER_NOT_NULL = "Listener cannot be null";
+    private static final String EVENT_NOT_NULL = "event cannot be null";
 
     private final Logger log = getLogger(getClass());
     private EventuallyConsistentMap<PortChainId, PortChain> portChainStore;
 
+    private EventuallyConsistentMapListener<PortChainId, PortChain> portChainListener =
+            new InnerPortChainStoreListener();
+
     @Reference(cardinality = ReferenceCardinality.MANDATORY_UNARY)
     protected StorageService storageService;
 
     @Activate
     public void activate() {
 
+        eventDispatcher.addSink(PortChainEvent.class, listenerRegistry);
+
         KryoNamespace.Builder serializer = KryoNamespace.newBuilder()
                 .register(KryoNamespaces.API)
                 .register(MultiValuedTimestamp.class)
@@ -71,11 +78,14 @@
                 .withName("portchainstore").withSerializer(serializer)
                 .withTimestampProvider((k, v) -> new WallClockTimestamp()).build();
 
+        portChainStore.addListener(portChainListener);
+
         log.info("Started");
     }
 
     @Deactivate
     public void deactivate() {
+        eventDispatcher.removeSink(PortChainEvent.class);
         portChainStore.destroy();
         log.info("Stopped");
     }
@@ -147,4 +157,35 @@
         }
         return true;
     }
+
+    private class InnerPortChainStoreListener
+            implements
+            EventuallyConsistentMapListener<PortChainId, PortChain> {
+
+        @Override
+        public void event(EventuallyConsistentMapEvent<PortChainId, PortChain> event) {
+            checkNotNull(event, EVENT_NOT_NULL);
+            PortChain portChain = event.value();
+            if (EventuallyConsistentMapEvent.Type.PUT == event.type()) {
+                notifyListeners(new PortChainEvent(
+                        PortChainEvent.Type.PORT_CHAIN_PUT,
+                        portChain));
+            }
+            if (EventuallyConsistentMapEvent.Type.REMOVE == event.type()) {
+                notifyListeners(new PortChainEvent(
+                        PortChainEvent.Type.PORT_CHAIN_DELETE,
+                        portChain));
+            }
+        }
+    }
+
+    /**
+     * Notifies specify event to all listeners.
+     *
+     * @param event port chain event
+     */
+    private void notifyListeners(PortChainEvent event) {
+        checkNotNull(event, EVENT_NOT_NULL);
+        post(event);
+    }
 }
diff --git a/apps/vtn/vtnrsc/src/test/java/org/onosproject/vtnrsc/portchain/impl/PortChainManagerTest.java b/apps/vtn/vtnrsc/src/test/java/org/onosproject/vtnrsc/portchain/impl/PortChainManagerTest.java
index 0831ec9..6c548d3 100644
--- a/apps/vtn/vtnrsc/src/test/java/org/onosproject/vtnrsc/portchain/impl/PortChainManagerTest.java
+++ b/apps/vtn/vtnrsc/src/test/java/org/onosproject/vtnrsc/portchain/impl/PortChainManagerTest.java
@@ -31,6 +31,9 @@
 import org.onosproject.vtnrsc.DefaultPortChain;
 import org.onosproject.vtnrsc.DefaultFlowClassifier;
 import org.onosproject.vtnrsc.util.VtnStorageServiceTest;
+import org.onosproject.common.event.impl.TestEventDispatcher;
+
+import static org.onosproject.net.NetTestTools.injectEventDispatcher;
 
 /**
  * Unit tests for PortChainManager class.
@@ -55,6 +58,7 @@
     public void testCreatePortChain() {
         // initialize port chain manager
         portChainMgr.storageService = storageService;
+        injectEventDispatcher(portChainMgr, new TestEventDispatcher());
         portChainMgr.activate();
 
         // create list of Port Pair Groups.
