diff --git a/java.j2seproject/nbproject/project.xml b/java.j2seproject/nbproject/project.xml
--- a/java.j2seproject/nbproject/project.xml
+++ b/java.j2seproject/nbproject/project.xml
@@ -203,7 +203,7 @@
                     <compile-dependency/>
                     <run-dependency>
                         <release-version>1</release-version>
-                        <specification-version>1.38</specification-version>
+                        <specification-version>1.39</specification-version>
                     </run-dependency>
                 </dependency>
                 <dependency>
diff --git a/java.j2seproject/src/org/netbeans/modules/java/j2seproject/J2SEActionProvider.java b/java.j2seproject/src/org/netbeans/modules/java/j2seproject/J2SEActionProvider.java
--- a/java.j2seproject/src/org/netbeans/modules/java/j2seproject/J2SEActionProvider.java
+++ b/java.j2seproject/src/org/netbeans/modules/java/j2seproject/J2SEActionProvider.java
@@ -51,19 +51,22 @@
 import java.util.Properties;
 import java.util.Set;
 import java.util.logging.Logger;
+import org.netbeans.api.annotations.common.NonNull;
 import org.netbeans.api.java.project.JavaProjectConstants;
 import org.netbeans.modules.java.api.common.ant.UpdateHelper;
 import org.netbeans.modules.java.api.common.project.ProjectProperties;
 import org.netbeans.modules.java.api.common.project.BaseActionProvider;
+import org.netbeans.spi.project.ActionProvider;
 import org.netbeans.spi.project.LookupProvider;
+import org.netbeans.spi.project.ProjectServiceProvider;
 import org.netbeans.spi.project.SingleMethod;
 import org.openide.util.Lookup;
-import org.openide.util.lookup.Lookups;
+import org.openide.util.Parameters;
 
 /** Action provider of the J2SE project. This is the place where to do
  * strange things to J2SE actions. E.g. compile-single.
  */
-class J2SEActionProvider extends BaseActionProvider implements AntTargetsProvider {
+public class J2SEActionProvider extends BaseActionProvider implements AntTargetsProvider {
 
     private static final Logger LOG = Logger.getLogger(J2SEActionProvider.class.getName());
 
@@ -208,18 +211,15 @@
         return names;
     }
 
-    /**
-     * position=100
-     */
-    public static class Registration implements LookupProvider {
-        @Override
-        public Lookup createAdditionalLookup(Lookup baseContext) {
-            final J2SEProject project = baseContext.lookup(J2SEProject.class);
-            final J2SEActionProvider j2seActionProvider = new J2SEActionProvider(project, project.getUpdateHelper());
-            j2seActionProvider.startFSListener();
-            return Lookups.fixed(j2seActionProvider);
-        }
-
+    @ProjectServiceProvider(
+            service=ActionProvider.class,
+            projectTypes={@LookupProvider.Registration.ProjectType(id="org-netbeans-modules-java-j2seproject",position=100)})
+    public static J2SEActionProvider create(@NonNull final Lookup lkp) {
+        Parameters.notNull("lkp", lkp); //NOI18N
+        final J2SEProject project = lkp.lookup(J2SEProject.class);
+        final J2SEActionProvider j2seActionProvider = new J2SEActionProvider(project, project.getUpdateHelper());
+        j2seActionProvider.startFSListener();
+        return j2seActionProvider;
     }
 
 }
diff --git a/java.j2seproject/src/org/netbeans/modules/java/j2seproject/ui/resources/layer.xml b/java.j2seproject/src/org/netbeans/modules/java/j2seproject/ui/resources/layer.xml
--- a/java.j2seproject/src/org/netbeans/modules/java/j2seproject/ui/resources/layer.xml
+++ b/java.j2seproject/src/org/netbeans/modules/java/j2seproject/ui/resources/layer.xml
@@ -70,13 +70,7 @@
                     <attr name="position" intvalue="200"/>
                 </file>
             </folder>
-            <folder name="Lookup">
-                <file name="J2SEActionProvider.instance">
-                    <attr name="instanceOf" stringvalue="org.netbeans.spi.project.LookupProvider"/>
-                    <attr name="instanceCreate" newvalue="org.netbeans.modules.java.j2seproject.J2SEActionProvider$Registration"/>
-                    <!-- <attr name="position" intvalue="100"/> -->
-                </file>
-            </folder>
+            <folder name="Lookup"/>
             <folder name="Actions">
                 <file name="org-netbeans-modules-project-ui-NewFile$WithSubMenu.shadow">
                     <attr name="originalFile" stringvalue="Actions/Project/org-netbeans-modules-project-ui-NewFile$WithSubMenu.instance"/>
diff --git a/javafx2.project/nbproject/project.xml b/javafx2.project/nbproject/project.xml
--- a/javafx2.project/nbproject/project.xml
+++ b/javafx2.project/nbproject/project.xml
@@ -134,7 +134,7 @@
                     <compile-dependency/>
                     <run-dependency>
                         <release-version>1</release-version>
-                        <specification-version>1.34</specification-version>
+                        <specification-version>1.39</specification-version>
                     </run-dependency>
                 </dependency>
                 <dependency>
diff --git a/javafx2.project/src/org/netbeans/modules/javafx2/project/JFXActionProvider.java b/javafx2.project/src/org/netbeans/modules/javafx2/project/JFXActionProvider.java
--- a/javafx2.project/src/org/netbeans/modules/javafx2/project/JFXActionProvider.java
+++ b/javafx2.project/src/org/netbeans/modules/javafx2/project/JFXActionProvider.java
@@ -50,12 +50,13 @@
 import org.netbeans.modules.java.j2seproject.api.J2SEPropertyEvaluator;
 import org.netbeans.spi.project.ActionProvider;
 import org.netbeans.spi.project.LookupProvider;
+import org.netbeans.spi.project.ProjectServiceProvider;
 import org.netbeans.spi.project.support.ant.GeneratedFilesHelper;
 import org.netbeans.spi.project.support.ant.PropertyEvaluator;
 import org.openide.filesystems.FileObject;
 import org.openide.util.Exceptions;
 import org.openide.util.Lookup;
-import org.openide.util.lookup.Lookups;
+import org.openide.util.Parameters;
 
 /**
  * Skeleton of JFX Action Provider
@@ -121,17 +122,12 @@
         return prj.getProjectDirectory().getFileObject (getBuildXmlName(ep.evaluator()));
     }
 
-    /**
-     * position=90
-     */
-    public static class Registration implements LookupProvider {
-        @Override
-        @NonNull
-        public Lookup createAdditionalLookup(@NonNull Lookup baseContext) {
-            final Project project = baseContext.lookup(Project.class);
-            final JFXActionProvider jfxActionProvider = new JFXActionProvider(project);
-            return Lookups.fixed(jfxActionProvider);
-        }
-
+    @ProjectServiceProvider(
+            service=ActionProvider.class,
+            projectTypes={@LookupProvider.Registration.ProjectType(id="org-netbeans-modules-java-j2seproject",position=90)})
+    public static ActionProvider create(@NonNull final Lookup lkp) {
+        Parameters.notNull("lkp", lkp); //NOI18N
+        final Project project = lkp.lookup(Project.class);
+        return new JFXActionProvider(project);
     }
 }
diff --git a/javafx2.project/src/org/netbeans/modules/javafx2/project/layer.xml b/javafx2.project/src/org/netbeans/modules/javafx2/project/layer.xml
--- a/javafx2.project/src/org/netbeans/modules/javafx2/project/layer.xml
+++ b/javafx2.project/src/org/netbeans/modules/javafx2/project/layer.xml
@@ -13,13 +13,7 @@
 
     <folder name="Projects">
         <folder name="org-netbeans-modules-java-j2seproject">
-            <folder name="Lookup">
-<!--                <file name="JFXActionProvider.instance">
-                    <attr name="instanceOf" stringvalue="org.netbeans.spi.project.LookupProvider"/>
-                    <attr name="instanceCreate" newvalue="org.netbeans.modules.javafx2.project.JFXActionProvider$Registration"/>
-                    <attr name="position" intvalue="90"/>
-                </file> -->
-            </folder>
+            <folder name="Lookup"/>
         </folder>
     </folder>