diff --git a/nbbuild/cluster.properties b/nbbuild/cluster.properties
--- a/nbbuild/cluster.properties
+++ b/nbbuild/cluster.properties
@@ -52,15 +52,14 @@
         nb.cluster.websvccommon,\
         nb.cluster.java,\
         nb.cluster.apisupport,\
+        nb.cluster.profiler,\
         nb.cluster.nb
-# cannot build w/o j2ee: nb.cluster.profiler
 
 clusters.config.standard.list=\
         ${clusters.config.basic.list},\
         nb.cluster.xml,\
         nb.cluster.gsf,\
         nb.cluster.j2ee,\
-        nb.cluster.profiler,\
         nb.cluster.mobility,\
         nb.cluster.visualweb,\
         nb.cluster.identity,\
@@ -119,14 +118,13 @@
         nb.cluster.harness,\
         nb.cluster.ide,\
         nb.cluster.websvccommon,\
-        nb.cluster.java
-# XXX nb.cluster.profiler
+        nb.cluster.java,\
+        nb.cluster.profiler
 
 clusters.config.j2ee.list=\
         ${clusters.config.java.list},\
         nb.cluster.j2ee,\
         nb.cluster.gsf,\
-        nb.cluster.profiler,\
         nb.cluster.webcommon,\
         nb.cluster.websvccommon
 
@@ -491,7 +489,8 @@
         nb.cluster.java,\
         nb.cluster.ide,\
         nb.cluster.gsf,\
-        nb.cluster.platform
+        nb.cluster.platform,\
+        nb.cluster.profiler
 nb.cluster.j2ee=\
         api.web.webmodule,\
         el.lexer,\
@@ -528,6 +527,11 @@
         libs.commons_fileupload,\
         libs.glassfish_logging,\
         libs.httpunit,\
+        profiler.j2ee,\
+        profiler.j2ee.jboss,\
+        profiler.j2ee.sunas,\
+        profiler.j2ee.tomcat,\
+        profiler.j2ee.weblogic,\
         projectimport.eclipse.web,\
         servletjspapi,\
         spring.webmvc,\
@@ -605,8 +609,7 @@
         nb.cluster.ide,\
         nb.cluster.java,\
         nb.cluster.platform,\
-        nb.cluster.gsf,\
-        nb.cluster.j2ee
+        nb.cluster.gsf
 nb.cluster.profiler=\
         debugger.jpda.heapwalk,\
         lib.profiler,\
@@ -616,11 +619,6 @@
         profiler.attach,\
         profiler.attach.impl,\
         profiler.freeform,\
-        profiler.j2ee,\
-        profiler.j2ee.jboss,\
-        profiler.j2ee.sunas,\
-        profiler.j2ee.tomcat,\
-        profiler.j2ee.weblogic,\
         profiler.j2se,\
         profiler.nbmodule,\
         profiler.projectsupport,\
@@ -1171,10 +1169,8 @@
         nb.cluster.ide,\
         nb.cluster.java,\
         nb.cluster.profiler,\
-        nb.cluster.j2ee,\
         nb.cluster.gsf,\
         nb.cluster.javafx
-# need to build j2ee and gsf to build profiler
 
 # webcommon cluster
 nb.cluster.webcommon.dir=webcommon1