diff --git a/src/extras/auto-import.js b/src/extras/auto-import.js
new file mode 100644
index 000000000..6d97b128c
--- /dev/null
+++ b/src/extras/auto-import.js
@@ -0,0 +1,40 @@
+/**
+ * Auto-import all calls to System.register during loading 
+ */
+(function (global) {
+  var systemJSPrototype = global.System.constructor.prototype;
+  var systemInstantiate = systemJSPrototype.instantiate;
+  var systemRegister = systemJSPrototype.register;
+  var systemGetRegister = systemJSPrototype.getRegister;
+
+  // hook into System.register
+  systemJSPrototype.register = function (deps, declare) {
+    // register normally
+    systemRegister.call(this, deps, declare);
+
+    // only auto import if the document is not loading
+    if (document.readyState !== 'loading') return;
+
+    // retrieve last register
+    var register = systemGetRegister.call(this);
+    
+    // hook into System.instantiate (but release it after first usage)
+    systemJSPrototype.instantiate = function () {
+      // reset System.instantiate for subsequent usage
+      systemJSPrototype.instantiate = systemInstantiate;
+      
+      return new Promise(function (resolve) {
+        // resolve with the last register
+        resolve(register);
+      });
+    };
+
+    // save the current url
+    // if it was not a external file, the script was inline so use baseURI
+    var scripts = document.getElementsByTagName("script");
+    var scriptUrl = scripts[scripts.length - 1].src || document.baseURI;
+    
+    // do the actual import
+    systemJSPrototype.import.call(this, scriptUrl);
+  };
+})(typeof self !== "undefined" ? self : global);