--- a/javatools/subsystem.mk	Thu May 27 12:49:31 2010 +0300
+++ b/javatools/subsystem.mk	Fri Jun 11 13:33:44 2010 +0300
@@ -19,7 +19,9 @@
 # Common
 COMPONENTS = \
 	tckrunner/starter/build \
-	tckrunner/runner/build
+	tckrunner/runner/build \
+	javacontrolpanel/starter/build \
+	javacontrolpanel/controlpanel/build \
 
 # Platform specific
 ifeq ($(BUILDENV),symbian)
@@ -43,7 +45,6 @@
 endif
 
 NONQTSUBSYSTEMS += \
-	javacaptain_app/build \
 	testcerts
 
 endif