diff --git a/java.api.common/src/org/netbeans/modules/java/api/common/classpath/BootClassPathImplementation.java b/java.api.common/src/org/netbeans/modules/java/api/common/classpath/BootClassPathImplementation.java
--- a/java.api.common/src/org/netbeans/modules/java/api/common/classpath/BootClassPathImplementation.java
+++ b/java.api.common/src/org/netbeans/modules/java/api/common/classpath/BootClassPathImplementation.java
@@ -75,12 +75,16 @@
     private List<PathResourceImplementation> resourcesCache;
     private long eventId;
     private PropertyChangeSupport support = new PropertyChangeSupport(this);
+    private ClassPath endorsedClassPath;
 
-    BootClassPathImplementation(PropertyEvaluator evaluator) {
+    BootClassPathImplementation(PropertyEvaluator evaluator, ClassPath endorsedClassPath) {
         assert evaluator != null;
-
+        this.endorsedClassPath = endorsedClassPath;
         this.evaluator = evaluator;
         evaluator.addPropertyChangeListener(WeakListeners.propertyChange(this, evaluator));
+        if (endorsedClassPath != null) {
+            endorsedClassPath.addPropertyChangeListener(this);
+        }
     }
     
     /**
@@ -97,6 +101,11 @@
 
         JavaPlatform jp = findActivePlatform();
         final List<PathResourceImplementation> result = new ArrayList<PathResourceImplementation>();
+        if (endorsedClassPath != null) {
+            for (ClassPath.Entry entry : endorsedClassPath.entries()) {
+                result.add(ClassPathSupport.createResource(entry.getURL()));
+            }
+        }
         if (jp != null) {
             // TODO: may also listen on CP, but from Platform it should be fixed
             final ClassPath cp = jp.getBootstrapLibraries();
@@ -154,6 +163,8 @@
                     resetCache();
                 }
             }
+        } else if (endorsedClassPath != null && evt.getSource() == endorsedClassPath) {
+            resetCache();
         }
     }
 
diff --git a/java.api.common/src/org/netbeans/modules/java/api/common/classpath/ClassPathProviderImpl.java b/java.api.common/src/org/netbeans/modules/java/api/common/classpath/ClassPathProviderImpl.java
--- a/java.api.common/src/org/netbeans/modules/java/api/common/classpath/ClassPathProviderImpl.java
+++ b/java.api.common/src/org/netbeans/modules/java/api/common/classpath/ClassPathProviderImpl.java
@@ -49,6 +49,7 @@
 import org.netbeans.api.project.ProjectManager;
 import org.netbeans.api.project.SourceGroup;
 import org.netbeans.modules.java.api.common.SourceRoots;
+import org.netbeans.modules.java.api.common.project.ProjectProperties;
 import org.netbeans.spi.java.classpath.ClassPathFactory;
 import org.netbeans.spi.java.classpath.ClassPathProvider;
 import org.netbeans.spi.java.project.classpath.support.ProjectClassPathSupport;
@@ -73,7 +74,8 @@
     private String[] javacTestClasspath = new String[]{"javac.test.classpath"};  //NOI18N
     private String[] runClasspath = new String[]{"run.classpath"};    //NOI18N
     private String[] runTestClasspath = new String[]{"run.test.classpath"};  //NOI18N
-    
+    private String[] endorsedClasspath = new String[]{ProjectProperties.ENDORSED_CLASSPATH};  //NOI18N
+
     private final AntProjectHelper helper;
     private final File projectDirectory;
     private final PropertyEvaluator evaluator;
@@ -90,8 +92,9 @@
      * 5  -  test execute class path
      * 6  -  execute class path for dist.jar
      * 7  -  boot class path
+     * 8  -  endorsed class path
      */
-    private final ClassPath[] cache = new ClassPath[8];
+    private final ClassPath[] cache = new ClassPath[9];
 
     private final Map<String,FileObject> dirCache = new HashMap<String,FileObject>();
 
@@ -118,6 +121,25 @@
             String buildClassesDir, String distJar, String buildTestClassesDir,
             String[] javacClasspath, String[] javacTestClasspath, String[] runClasspath,
             String[] runTestClasspath) {
+        this(helper,
+            evaluator,
+            sourceRoots,
+            testSourceRoots,
+            buildClassesDir,
+            distJar,
+            buildTestClassesDir,
+            javacClasspath,
+            javacTestClasspath,
+            runClasspath,
+            runTestClasspath,
+            new String[]{ProjectProperties.ENDORSED_CLASSPATH});
+    }
+    
+    public ClassPathProviderImpl(AntProjectHelper helper, PropertyEvaluator evaluator,
+            SourceRoots sourceRoots, SourceRoots testSourceRoots,
+            String buildClassesDir, String distJar, String buildTestClassesDir,
+            String[] javacClasspath, String[] javacTestClasspath, String[] runClasspath,
+            String[] runTestClasspath, String[] endorsedClasspath) {
         this(helper, evaluator, sourceRoots, testSourceRoots);
         this.buildClassesDir = buildClassesDir;
         this.distJar = distJar;
@@ -126,6 +148,7 @@
         this.javacTestClasspath = javacTestClasspath;
         this.runClasspath = runClasspath;
         this.runTestClasspath = runTestClasspath;
+        this.endorsedClasspath = endorsedClasspath;
     }
 
     
@@ -293,6 +316,17 @@
         return cp;
     }
     
+    private synchronized ClassPath getEndorsedClasspath() {
+        ClassPath cp = cache[8];
+        if ( cp == null) {
+            cp = ClassPathFactory.createClassPath(
+                ProjectClassPathSupport.createPropertyBasedClassPathImplementation(
+                    projectDirectory, evaluator, endorsedClasspath)); // NOI18N
+            cache[8] = cp;
+        }
+        return cp;
+    }
+
     private ClassPath getSourcepath(FileObject file) {
         int type = getType(file);
         return this.getSourcepath(type);
@@ -320,7 +354,7 @@
     private synchronized ClassPath getBootClassPath() {
         ClassPath cp = cache[7];
         if ( cp== null ) {
-            cp = ClassPathFactory.createClassPath(ClassPathSupportFactory.createBootClassPathImplementation(evaluator));
+            cp = ClassPathFactory.createClassPath(ClassPathSupportFactory.createBootClassPathImplementation(evaluator, getEndorsedClasspath()));
             cache[7] = cp;
         }
         return cp;
@@ -335,6 +369,8 @@
             return getSourcepath(file);
         } else if (type.equals(ClassPath.BOOT)) {
             return getBootClassPath();
+        } else if (type.equals(ClassPathSupport.ENDORSED)) {
+            return getEndorsedClasspath();
         } else {
             return null;
         }
@@ -389,6 +425,9 @@
     }
 
     public String[] getPropertyName (final SourceRoots roots, final String type) {
+        if (ClassPathSupport.ENDORSED.equals(type)) {
+            return endorsedClasspath;
+        }
         if (roots.isTest()) {
             if (ClassPath.COMPILE.equals(type)) {
                 return javacTestClasspath;
@@ -414,6 +453,9 @@
     }
     
     public String[] getPropertyName (SourceGroup sg, String type) {
+        if (ClassPathSupport.ENDORSED.equals(type)) {
+            return endorsedClasspath;
+        }
         FileObject root = sg.getRootFolder();
         FileObject[] path = getPrimarySrcPath();
         for (int i=0; i<path.length; i++) {
diff --git a/java.api.common/src/org/netbeans/modules/java/api/common/classpath/ClassPathSupport.java b/java.api.common/src/org/netbeans/modules/java/api/common/classpath/ClassPathSupport.java
--- a/java.api.common/src/org/netbeans/modules/java/api/common/classpath/ClassPathSupport.java
+++ b/java.api.common/src/org/netbeans/modules/java/api/common/classpath/ClassPathSupport.java
@@ -76,6 +76,8 @@
  * @since org.netbeans.modules.java.api.common/1 1.5
  */
 public final class ClassPathSupport {
+
+    public static final String ENDORSED = "classpath/endorsed";
                 
     // Prefixes and suffixes of classpath
     private static final String LIBRARY_PREFIX = "${libs."; // NOI18N
diff --git a/java.api.common/src/org/netbeans/modules/java/api/common/classpath/ClassPathSupportFactory.java b/java.api.common/src/org/netbeans/modules/java/api/common/classpath/ClassPathSupportFactory.java
--- a/java.api.common/src/org/netbeans/modules/java/api/common/classpath/ClassPathSupportFactory.java
+++ b/java.api.common/src/org/netbeans/modules/java/api/common/classpath/ClassPathSupportFactory.java
@@ -39,6 +39,7 @@
 
 package org.netbeans.modules.java.api.common.classpath;
 
+import org.netbeans.api.java.classpath.ClassPath;
 import org.netbeans.modules.java.api.common.SourceRoots;
 import org.netbeans.spi.java.classpath.ClassPathImplementation;
 import org.netbeans.spi.project.support.ant.AntProjectHelper;
@@ -60,7 +61,18 @@
      * @return classpath implementation
      */
     public static ClassPathImplementation createBootClassPathImplementation(PropertyEvaluator evaluator) {
-        return new BootClassPathImplementation(evaluator);
+        return new BootClassPathImplementation(evaluator, null);
+    }
+
+    /**
+     * Creates implementation of BOOT classpath based on project's <code>platform.active</code>
+     * property and given endorsed classpath which will have precedence of platform classpath.
+     * @param evaluator project's property evaluator
+     * @param endorsedClassPath endorsed classpath to prepend to boot classpath
+     * @return classpath implementation
+     */
+    public static ClassPathImplementation createBootClassPathImplementation(PropertyEvaluator evaluator, ClassPath endorsedClassPath) {
+        return new BootClassPathImplementation(evaluator, endorsedClassPath);
     }
 
     /**
diff --git a/java.api.common/src/org/netbeans/modules/java/api/common/project/ProjectProperties.java b/java.api.common/src/org/netbeans/modules/java/api/common/project/ProjectProperties.java
--- a/java.api.common/src/org/netbeans/modules/java/api/common/project/ProjectProperties.java
+++ b/java.api.common/src/org/netbeans/modules/java/api/common/project/ProjectProperties.java
@@ -59,6 +59,7 @@
     public static final String RUN_TEST_CLASSPATH = "run.test.classpath"; // NOI18N
     public static final String BUILD_CLASSES_DIR = "build.classes.dir"; //NOI18N
     public static final String BUILD_TEST_CLASSES_DIR = "build.test.classes.dir"; // NOI18N
+    public static final String ENDORSED_CLASSPATH = "endorsed.classpath"; // NOI18N
 
     public static final String[] WELL_KNOWN_PATHS = new String[] {
         "${" + JAVAC_CLASSPATH + "}", // NOI18N
@@ -66,6 +67,7 @@
         "${" + RUN_CLASSPATH + "}", // NOI18N
         "${" + RUN_TEST_CLASSPATH + "}", // NOI18N
         "${" + BUILD_CLASSES_DIR + "}", // NOI18N
+        "${" + ENDORSED_CLASSPATH + "}", // NOI18N
         "${" + BUILD_TEST_CLASSES_DIR + "}" // NOI18N
     };    
    
diff --git a/web.project/src/org/netbeans/modules/web/project/resources/build-impl.xsl b/web.project/src/org/netbeans/modules/web/project/resources/build-impl.xsl
--- a/web.project/src/org/netbeans/modules/web/project/resources/build-impl.xsl
+++ b/web.project/src/org/netbeans/modules/web/project/resources/build-impl.xsl
@@ -321,6 +321,10 @@
                     </and>
                 </condition>
                 <property name="runmain.jvmargs" value=""/>
+                <path id="endorsed.classpath.path" path="${{endorsed.classpath}}"/>
+                <condition property="endorsed.classpath.cmd.line.arg" value="-Xbootclasspath/p:${{toString:endorsed.classpath.path}}" else="">
+                    <length length="0" string="${{endorsed.classpath}}" when="greater"/>
+                </condition>
             </target>
             
             <!-- COS feature - used in run-deploy -->
@@ -455,6 +459,7 @@
                             <classpath>
                                 <path path="@{{classpath}}"/>
                             </classpath>
+                            <compilerarg line="${{endorsed.classpath.cmd.line.arg}}"/>
                             <compilerarg line="${{javac.compilerargs}} ${{javac.compilerargs.jaxws}}"/>
                             <customize/>
                         </javac>
@@ -532,6 +537,7 @@
                             <xsl:if test="/p:project/p:configuration/webproject3:data/webproject3:explicit-platform">
                                 <xsl:attribute name="jvm">${platform.java}</xsl:attribute>
                             </xsl:if>
+                            <jvmarg line="${{endorsed.classpath.cmd.line.arg}}"/>
                             <jvmarg line="${{runmain.jvmargs}}"/>
                             <!--
                                 #113297, #118187
@@ -670,6 +676,7 @@
                             <xsl:if test="/p:project/p:configuration/webproject3:data/webproject3:explicit-platform">
                                 <xsl:attribute name="jvm">${platform.java}</xsl:attribute>
                             </xsl:if>
+                            <jvmarg line="${{endorsed.classpath.cmd.line.arg}}"/>
                             <jvmarg line="${{debug-args-line}}"/>
                             <jvmarg value="-Xrunjdwp:transport=${{debug-transport}},address=${{jpda.address}}"/>
                             <jvmarg line="${{runmain.jvmargs}}"/>
diff --git a/web.project/src/org/netbeans/modules/web/project/ui/customizer/CustomizerLibraries.java b/web.project/src/org/netbeans/modules/web/project/ui/customizer/CustomizerLibraries.java
--- a/web.project/src/org/netbeans/modules/web/project/ui/customizer/CustomizerLibraries.java
+++ b/web.project/src/org/netbeans/modules/web/project/ui/customizer/CustomizerLibraries.java
@@ -216,6 +216,7 @@
         DefaultListModel[] models = new DefaultListModel[]{
             uiProperties.JAVAC_CLASSPATH_MODEL.getDefaultListModel(),
             uiProperties.JAVAC_TEST_CLASSPATH_MODEL,
+            uiProperties.ENDORSED_CLASSPATH_MODEL,
             uiProperties.RUN_TEST_CLASSPATH_MODEL
            };
         for (int i = 0; i < models.length; i++) {
@@ -263,6 +264,7 @@
         DefaultListModel[] models = new DefaultListModel[] {
             uiProperties.JAVAC_CLASSPATH_MODEL.getDefaultListModel(),
             uiProperties.JAVAC_TEST_CLASSPATH_MODEL,
+            uiProperties.ENDORSED_CLASSPATH_MODEL,
             uiProperties.RUN_TEST_CLASSPATH_MODEL,
         };
         
@@ -775,6 +777,7 @@
                 Mnemonics.setLocalizedText(librariesBrowse, NbBundle.getMessage(CustomizerLibraries.class, "LBL_CustomizerLibraries_Browse_JButton")); // NOI18N
                 updateJars(uiProperties.JAVAC_CLASSPATH_MODEL.getDefaultListModel());
                 updateJars(uiProperties.JAVAC_TEST_CLASSPATH_MODEL);
+                updateJars(uiProperties.ENDORSED_CLASSPATH_MODEL);
                 updateJars(uiProperties.RUN_TEST_CLASSPATH_MODEL);
                 switchLibrary();
                 cleanupOldLibraryReferences();
@@ -797,6 +800,7 @@
         collectLibs(uiProperties.JAVAC_CLASSPATH_MODEL.getDefaultListModel(), libs, jars);
         collectLibs(uiProperties.JAVAC_TEST_CLASSPATH_MODEL, libs, jars);
         collectLibs(uiProperties.RUN_TEST_CLASSPATH_MODEL, libs, jars);
+        collectLibs(uiProperties.ENDORSED_CLASSPATH_MODEL, libs, jars);
         collectLibs(uiProperties.WAR_CONTENT_ADDITIONAL_MODEL.getDefaultListModel(), libs, jars);
         libs.add("CopyLibs"); // NOI18N
         boolean res = SharableLibrariesUtils.showMakeSharableWizard(uiProperties.getProject().getAntProjectHelper(), uiProperties.getProject().getReferenceHelper(), libs, jars);
diff --git a/web.project/src/org/netbeans/modules/web/project/ui/customizer/WebProjectProperties.java b/web.project/src/org/netbeans/modules/web/project/ui/customizer/WebProjectProperties.java
--- a/web.project/src/org/netbeans/modules/web/project/ui/customizer/WebProjectProperties.java
+++ b/web.project/src/org/netbeans/modules/web/project/ui/customizer/WebProjectProperties.java
@@ -227,6 +227,7 @@
     ClassPathTableModel JAVAC_CLASSPATH_MODEL;
     DefaultListModel JAVAC_TEST_CLASSPATH_MODEL;
     DefaultListModel RUN_TEST_CLASSPATH_MODEL;
+    DefaultListModel ENDORSED_CLASSPATH_MODEL;
     ComboBoxModel PLATFORM_MODEL;
     ListCellRenderer CLASS_PATH_LIST_RENDERER;
     ListCellRenderer PLATFORM_LIST_RENDERER;
@@ -355,6 +356,7 @@
         JAVAC_CLASSPATH_MODEL = ClassPathTableModel.createTableModel( cs.itemsIterator( (String)projectProperties.get( ProjectProperties.JAVAC_CLASSPATH ), ClassPathSupportCallbackImpl.TAG_WEB_MODULE_LIBRARIES) );
         JAVAC_TEST_CLASSPATH_MODEL = ClassPathUiSupport.createListModel( cs.itemsIterator( (String)projectProperties.get( ProjectProperties.JAVAC_TEST_CLASSPATH ), null ) );
         RUN_TEST_CLASSPATH_MODEL = ClassPathUiSupport.createListModel( cs.itemsIterator( (String)projectProperties.get( ProjectProperties.RUN_TEST_CLASSPATH ), null ) );
+        ENDORSED_CLASSPATH_MODEL = ClassPathUiSupport.createListModel( cs.itemsIterator( (String)projectProperties.get( ProjectProperties.ENDORSED_CLASSPATH ), null ) );
         PLATFORM_MODEL = PlatformUiSupport.createPlatformComboBoxModel (evaluator.getProperty(JAVA_PLATFORM));
         PLATFORM_LIST_RENDERER = PlatformUiSupport.createPlatformListCellRenderer();
         SpecificationVersion minimalSourceLevel = null;
@@ -635,6 +637,7 @@
         String[] javac_test_cp = cs.encodeToStrings( ClassPathUiSupport.getList( JAVAC_TEST_CLASSPATH_MODEL ), null );
         String[] run_test_cp = cs.encodeToStrings( ClassPathUiSupport.getList( RUN_TEST_CLASSPATH_MODEL ), null );
         String[] war_includes = cs.encodeToStrings( ClassPathUiSupport.getList( WAR_CONTENT_ADDITIONAL_MODEL.getDefaultListModel() ), ClassPathSupportCallbackImpl.TAG_WEB_MODULE__ADDITIONAL_LIBRARIES  );
+        String[] endorsed_cp = cs.encodeToStrings( ClassPathUiSupport.getList( ENDORSED_CLASSPATH_MODEL ), null );
 
         // Store standard properties
         EditableProperties projectProperties = updateHelper.getProperties( AntProjectHelper.PROJECT_PROPERTIES_PATH );        
@@ -673,6 +676,7 @@
         projectProperties.setProperty( ProjectProperties.JAVAC_CLASSPATH, javac_cp );
         projectProperties.setProperty( ProjectProperties.JAVAC_TEST_CLASSPATH, javac_test_cp );
         projectProperties.setProperty( ProjectProperties.RUN_TEST_CLASSPATH, run_test_cp );
+        projectProperties.setProperty( ProjectProperties.ENDORSED_CLASSPATH, endorsed_cp );
         
         projectProperties.setProperty( WAR_CONTENT_ADDITIONAL, war_includes );