diff --git a/changelog.html b/changelog.html
index ec3a90e1f5..e52c1e2406 100644
--- a/changelog.html
+++ b/changelog.html
@@ -87,6 +87,8 @@ Upcoming changes
Exploit commons-codec for Base64 encoding rather than proprietary sun.misc.BASE64Encoder
(issue 9521)
+
+ Order of extension implementations is made bit more deterministic
diff --git a/core/src/main/java/hudson/ExtensionComponent.java b/core/src/main/java/hudson/ExtensionComponent.java
index 2f7eea3e13..8b0af778d4 100644
--- a/core/src/main/java/hudson/ExtensionComponent.java
+++ b/core/src/main/java/hudson/ExtensionComponent.java
@@ -24,6 +24,8 @@
package hudson;
+import hudson.model.Descriptor;
+
/**
* Discovered {@link Extension} object with a bit of metadata for Hudson.
* This is a plain value object.
@@ -72,6 +74,12 @@ public class ExtensionComponent implements Comparable>
double b = that.ordinal();
if (a>b) return -1;
if (a