diff --git a/core.startup/src/org/netbeans/core/startup/NbInstaller.java b/core.startup/src/org/netbeans/core/startup/NbInstaller.java
--- a/core.startup/src/org/netbeans/core/startup/NbInstaller.java
+++ b/core.startup/src/org/netbeans/core/startup/NbInstaller.java
@@ -330,7 +330,6 @@
     protected void classLoaderUp(ClassLoader cl) {
         MainLookup.systemClassLoaderChanged(cl);
         ev.log(Events.PERF_TICK, "META-INF/services/ additions registered"); // NOI18N
-        onStartStop.initialize();
     }
 
     final void waitOnStart() {
@@ -346,6 +345,9 @@
         loadLayers(modules, true);
         ev.log(Events.PERF_TICK, "layers loaded"); // NOI18N
 	
+        onStartStop.initialize();
+        ev.log(Events.PERF_TICK, "@OnStart"); // NOI18N
+
         ev.log(Events.PERF_START, "NbInstaller.load - sections"); // NOI18N
         ev.log(Events.LOAD_SECTION);
         CoreBridge.getDefault().loaderPoolTransaction(true);
diff --git a/project.libraries/manifest.mf b/project.libraries/manifest.mf
--- a/project.libraries/manifest.mf
+++ b/project.libraries/manifest.mf
@@ -1,6 +1,5 @@
 Manifest-Version: 1.0
 OpenIDE-Module: org.netbeans.modules.project.libraries/1
-OpenIDE-Module-Install: org/netbeans/modules/project/libraries/LibrariesModule.class
 OpenIDE-Module-Layer: org/netbeans/modules/project/libraries/resources/mf-layer.xml
 OpenIDE-Module-Specification-Version: 1.35
 OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/project/libraries/resources/Bundle.properties
diff --git a/project.libraries/nbproject/project.xml b/project.libraries/nbproject/project.xml
--- a/project.libraries/nbproject/project.xml
+++ b/project.libraries/nbproject/project.xml
@@ -119,7 +119,7 @@
                     <build-prerequisite/>
                     <compile-dependency/>
                     <run-dependency>
-                        <specification-version>6.2</specification-version>
+                        <specification-version>7.29</specification-version>
                     </run-dependency>
                 </dependency>
                 <dependency>
diff --git a/project.libraries/src/org/netbeans/modules/project/libraries/LibrariesModule.java b/project.libraries/src/org/netbeans/modules/project/libraries/LibrariesModule.java
--- a/project.libraries/src/org/netbeans/modules/project/libraries/LibrariesModule.java
+++ b/project.libraries/src/org/netbeans/modules/project/libraries/LibrariesModule.java
@@ -43,9 +43,9 @@
  */
 package org.netbeans.modules.project.libraries;
 
-import org.openide.modules.ModuleInstall;
 import org.openide.util.Lookup;
 import org.netbeans.spi.project.libraries.LibraryProvider;
+import org.openide.modules.OnStart;
 
 /**
  * Ensures that all {@link LibraryProvider}s are actually loaded.
@@ -54,14 +54,9 @@
  * This needs to happen before any Ant build is run.
  * @author Tomas Zezula
  */
-public class LibrariesModule extends ModuleInstall {
-
-    @Override public void restored() {
-        super.restored();
-        this.initProviders();
-    }
-    
-    private void initProviders () {
+@OnStart
+public class LibrariesModule implements Runnable {
+    @Override public void run() {
         for (LibraryProvider lp : Lookup.getDefault().lookupAll(LibraryProvider.class)) {            
             lp.getLibraries();
         }