diff --git a/core/src/main/java/hudson/model/AbstractBuild.java b/core/src/main/java/hudson/model/AbstractBuild.java
index 88a8082f673d26d3f4405e6f70e604d80d091a3b..d93eff1449f50046aef8ad4d2e1f8185fade4168 100644
--- a/core/src/main/java/hudson/model/AbstractBuild.java
+++ b/core/src/main/java/hudson/model/AbstractBuild.java
@@ -563,7 +563,7 @@ public abstract class AbstractBuild<P extends AbstractProject<P,R>,R extends Abs
                     // for historical reasons, null in the scm field means CVS, so we need to explicitly set this to something
                     // in case check out fails and leaves a broken changelog.xml behind.
                     // see http://www.nabble.com/CVSChangeLogSet.parse-yields-SAXParseExceptions-when-parsing-bad-*AccuRev*-changelog.xml-files-td22213663.html
-                    AbstractBuild.this.scm = new NullChangeLogParser();
+                    AbstractBuild.this.scm = NullChangeLogParser.INSTANCE;
 
                     try {
                         if (project.checkout(AbstractBuild.this,launcher,listener,new File(getRootDir(),"changelog.xml"))) {
diff --git a/core/src/main/java/hudson/scm/NullChangeLogParser.java b/core/src/main/java/hudson/scm/NullChangeLogParser.java
old mode 100644
new mode 100755
index 976d4438646e6c138006d0a58b3b726be285aa87..1c40e52d7ffd9679f1763d521cdd3f5bd7f762d4
--- a/core/src/main/java/hudson/scm/NullChangeLogParser.java
+++ b/core/src/main/java/hudson/scm/NullChangeLogParser.java
@@ -34,7 +34,14 @@ import java.io.IOException;
  * @author Kohsuke Kawaguchi
  */
 public class NullChangeLogParser extends ChangeLogParser {
+    
+    public static final NullChangeLogParser INSTANCE = new NullChangeLogParser();
+    
     public ChangeLogSet<? extends ChangeLogSet.Entry> parse(AbstractBuild build, File changelogFile) throws IOException, SAXException {
         return ChangeLogSet.createEmpty(build);
     }
+    
+    public Object readResolve() {
+        return INSTANCE;
+    }
 }
diff --git a/core/src/main/java/hudson/scm/NullSCM.java b/core/src/main/java/hudson/scm/NullSCM.java
old mode 100644
new mode 100755
index 419c5fbe3e3adf6ed7927fd8323d171347857ccc..9db1b8eb00db9c8d41fad647baf07048f16f2215
--- a/core/src/main/java/hudson/scm/NullSCM.java
+++ b/core/src/main/java/hudson/scm/NullSCM.java
@@ -55,7 +55,7 @@ public class NullSCM extends SCM {
     }
 
     public ChangeLogParser createChangeLogParser() {
-        return new NullChangeLogParser();
+        return NullChangeLogParser.INSTANCE;
     }
 
     @Extension