diff --git a/core/src/main/java/hudson/model/Job.java b/core/src/main/java/hudson/model/Job.java
index 42f7d5638de61a434f16763dcacfa7c4c6aa583e..ba8e4d1c06e3f537ab464b7b202774931372ef55 100644
--- a/core/src/main/java/hudson/model/Job.java
+++ b/core/src/main/java/hudson/model/Job.java
@@ -3,6 +3,7 @@ package hudson.model;
 import hudson.ExtensionPoint;
 import hudson.Util;
 import hudson.model.Descriptor.FormException;
+import hudson.model.listeners.ItemListener;
 import hudson.search.QuickSilver;
 import hudson.search.SearchIndex;
 import hudson.search.SearchIndexBuilder;
@@ -366,15 +367,8 @@ public abstract class Job<JobT extends Job<JobT,RunT>, RunT extends Run<JobT,Run
 
                 parent.onRenamed((TopLevelItem)this,oldName,newName);
 
-                // update BuildTrigger of other projects that point to this object.
-                // can't we generalize this?
-                for( Project p : parent.getProjects() ) {
-                    BuildTrigger t = (BuildTrigger) p.getPublishers().get(BuildTrigger.DESCRIPTOR);
-                    if(t!=null) {
-                        if(t.onJobRenamed(oldName,newName))
-                            p.save();
-                    }
-                }
+                for (ItemListener l : Hudson.getInstance().getJobListeners())
+                    l.onRenamed(this,oldName,newName);
             }
         }
     }
diff --git a/core/src/main/java/hudson/model/listeners/ItemListener.java b/core/src/main/java/hudson/model/listeners/ItemListener.java
index e3d45e2e5fbcda73e0a4e3e76179abbeeda73c14..fb3a383563c9a2f3b78941151bf7e13f46c3a8e3 100644
--- a/core/src/main/java/hudson/model/listeners/ItemListener.java
+++ b/core/src/main/java/hudson/model/listeners/ItemListener.java
@@ -3,6 +3,7 @@ package hudson.model.listeners;
 import hudson.ExtensionPoint;
 import hudson.model.Hudson;
 import hudson.model.Item;
+import hudson.model.Job;
 
 /**
  * @since 1.74
@@ -29,4 +30,18 @@ public class ItemListener implements ExtensionPoint {
      */
     public void onDeleted(Item item) {
     }
+
+    /**
+     * Called after a job is renamed.
+     *
+     * @param item
+     *      The job being renamed.
+     * @param oldName
+     *      The old name of the job.
+     * @param newName
+     *      The new name of the job. Same as {@link Item#getName()}.
+     * @since 1.146
+     */
+    public void onRenamed(Item item, String oldName, String newName) {
+    }
 }
diff --git a/core/src/main/java/hudson/model/listeners/JobListener.java b/core/src/main/java/hudson/model/listeners/JobListener.java
index ec03d284648699571dd95e18c994559c512aeff9..e59c80db9568e8f7546d7c0bb4b547133bd1f1d1 100644
--- a/core/src/main/java/hudson/model/listeners/JobListener.java
+++ b/core/src/main/java/hudson/model/listeners/JobListener.java
@@ -13,6 +13,7 @@ import hudson.ExtensionPoint;
  *
  * @author Kohsuke Kawaguchi
  * @see Hudson#addListener(JobListener)
+ * @deprecated {@link ItemListener} is the generalized form of this.
  */
 public abstract class JobListener implements ExtensionPoint {
     /**
diff --git a/core/src/main/java/hudson/tasks/BuildTrigger.java b/core/src/main/java/hudson/tasks/BuildTrigger.java
index e07f03137a03d6bd46d148da2a42c5b246a9f5c3..f786ee2e0b0e7fb608815c18d8b61b70ed22174d 100644
--- a/core/src/main/java/hudson/tasks/BuildTrigger.java
+++ b/core/src/main/java/hudson/tasks/BuildTrigger.java
@@ -9,18 +9,22 @@ import hudson.model.Hudson;
 import hudson.model.Item;
 import hudson.model.Items;
 import hudson.model.Job;
+import hudson.model.Project;
 import hudson.model.Result;
+import hudson.model.listeners.ItemListener;
 import hudson.util.FormFieldValidator;
+import org.kohsuke.stapler.DataBoundConstructor;
 import org.kohsuke.stapler.StaplerRequest;
 import org.kohsuke.stapler.StaplerResponse;
-import org.kohsuke.stapler.DataBoundConstructor;
 
 import javax.servlet.ServletException;
 import java.io.IOException;
 import java.io.PrintStream;
+import java.util.Collection;
 import java.util.List;
 import java.util.StringTokenizer;
-import java.util.Collection;
+import java.util.logging.Logger;
+import java.util.logging.Level;
 
 /**
  * Triggers builds of other projects.
@@ -146,6 +150,26 @@ public class BuildTrigger extends Publisher {
     public static class DescriptorImpl extends Descriptor<Publisher> {
         public DescriptorImpl() {
             super(BuildTrigger.class);
+
+            Hudson.getInstance().getJobListeners().add(new ItemListener() {
+                @Override
+                public void onRenamed(Item item, String oldName, String newName) {
+                    // update BuildTrigger of other projects that point to this object.
+                    // can't we generalize this?
+                    for( Project p : Hudson.getInstance().getProjects() ) {
+                        BuildTrigger t = (BuildTrigger) p.getPublishers().get(BuildTrigger.DESCRIPTOR);
+                        if(t!=null) {
+                            if(t.onJobRenamed(oldName,newName)) {
+                                try {
+                                    p.save();
+                                } catch (IOException e) {
+                                    LOGGER.log(Level.WARNING, "Failed to persist project setting during rename from "+oldName+" to "+newName,e);
+                                }
+                            }
+                        }
+                    }
+                }
+            });
         }
 
         public String getDisplayName() {
@@ -191,4 +215,6 @@ public class BuildTrigger extends Publisher {
             }.process();
         }
     }
+
+    private static final Logger LOGGER = Logger.getLogger(BuildTrigger.class.getName());
 }