diff --git a/java.j2seplatform/src/org/netbeans/modules/java/j2seplatform/libraries/J2SELibraryTypeProvider.java b/java.j2seplatform/src/org/netbeans/modules/java/j2seplatform/libraries/J2SELibraryTypeProvider.java
--- a/java.j2seplatform/src/org/netbeans/modules/java/j2seplatform/libraries/J2SELibraryTypeProvider.java
+++ b/java.j2seplatform/src/org/netbeans/modules/java/j2seplatform/libraries/J2SELibraryTypeProvider.java
@@ -75,12 +75,11 @@
 import org.openide.util.Exceptions;
 import org.openide.util.Lookup;
 import org.openide.util.NbBundle;
+import org.openide.util.lookup.ServiceProvider;
 
+@ServiceProvider(service=LibraryTypeProvider.class, path="org-netbeans-api-project-libraries/LibraryTypeProviders")
 public final class J2SELibraryTypeProvider implements LibraryTypeProvider {
 
-    private J2SELibraryTypeProvider () {
-    }
-
     private static final Logger LOG = Logger.getLogger(J2SELibraryTypeProvider.class.getName());
 
     private static final String LIB_PREFIX = "libs.";       //NOI18N
@@ -182,10 +181,6 @@
         return Lookup.EMPTY;
     }
 
-    public static LibraryTypeProvider create () {
-        return new J2SELibraryTypeProvider();
-    }
-
     private static boolean addLibraryIntoBuild(LibraryImplementation impl, EditableProperties props) {
         boolean modified = false;
         for (int i=0; i<VOLUME_TYPES.length; i++) {
diff --git a/java.j2seplatform/src/org/netbeans/modules/java/j2seplatform/resources/layer.xml b/java.j2seplatform/src/org/netbeans/modules/java/j2seplatform/resources/layer.xml
--- a/java.j2seplatform/src/org/netbeans/modules/java/j2seplatform/resources/layer.xml
+++ b/java.j2seplatform/src/org/netbeans/modules/java/j2seplatform/resources/layer.xml
@@ -45,17 +45,6 @@
 -->
 <!DOCTYPE filesystem PUBLIC "-//NetBeans//DTD Filesystem 1.1//EN" "http://www.netbeans.org/dtds/filesystem-1_1.dtd">
 <filesystem>
-    <folder name="org-netbeans-api-project-libraries">
-        <folder name="LibraryTypeProviders">
-            <file name="j2se_library_provider.instance">
-                <attr name="instanceOf" stringvalue="org.netbeans.spi.project.libraries.LibraryTypeProvider"/>
-                <attr name="instanceClass" stringvalue="org.netbeans.modules.java.j2seplatform.libraries.J2SELibraryTypeProvider"/>
-                <attr name="instanceCreate" methodvalue="org.netbeans.modules.java.j2seplatform.libraries.J2SELibraryTypeProvider.create"/>
-                <attr name="position" intvalue="100"/>
-            </file>
-        </folder>
-    </folder>
-
     <folder name="org-netbeans-api-java">
         <folder name="platform">
             <folder name="installers">