diff --git a/core/src/main/java/hudson/model/listeners/JobListener.java b/core/src/main/java/hudson/model/listeners/JobListener.java
index 103abeb135dedb6ab3b6863ef13ff8b5a21866b4..acb7efe36a69fd395289bfd71c14224751938ece 100644
--- a/core/src/main/java/hudson/model/listeners/JobListener.java
+++ b/core/src/main/java/hudson/model/listeners/JobListener.java
@@ -2,6 +2,7 @@ package hudson.model.listeners;
 
 import hudson.model.Hudson;
 import hudson.model.Job;
+import hudson.ExtensionPoint;
 
 /**
  * Receives notifications about jobs.
@@ -12,7 +13,7 @@ import hudson.model.Job;
  * @author Kohsuke Kawaguchi
  * @see Hudson#addListener(JobListener)
  */
-public abstract class JobListener {
+public abstract class JobListener implements ExtensionPoint {
     /**
      * Called after a new job is created and added to {@link Hudson}.
      */
diff --git a/core/src/main/java/hudson/model/listeners/SCMListener.java b/core/src/main/java/hudson/model/listeners/SCMListener.java
index 0976c98074e2ffee8018ca253dac76e4f095b5e1..d18c65ec99e9e312cfdb79a0862ac691f7d9d51d 100644
--- a/core/src/main/java/hudson/model/listeners/SCMListener.java
+++ b/core/src/main/java/hudson/model/listeners/SCMListener.java
@@ -6,6 +6,7 @@ import hudson.model.BuildListener;
 import hudson.model.Hudson;
 import hudson.scm.ChangeLogSet;
 import hudson.scm.SCM;
+import hudson.ExtensionPoint;
 
 /**
  * Receives notifications about SCM activities in Hudson.
@@ -20,7 +21,7 @@ import hudson.scm.SCM;
  * @see Hudson#getSCMListeners()
  * @since 1.70
  */
-public abstract class SCMListener {
+public abstract class SCMListener implements ExtensionPoint {
     /**
      * Called once the changelog is determined.
      *