diff -r 584193b539f4 -r 10aafb02a17d symbian3/single/sysdefs/system_model_3.0.xml
--- a/symbian3/single/sysdefs/system_model_3.0.xml	Fri Apr 30 17:26:20 2010 +0100
+++ b/symbian3/single/sysdefs/system_model_3.0.xml	Fri Apr 30 17:41:38 2010 +0100
@@ -11066,28 +11066,8 @@
 </component>
 </collection>
 <collection id="java_stubs" name="Java Stubs" level="util">
-<meta rel="config">
-<defined condition="__JAVA_STUBS"/>
-</meta>
-<!-- uncomment all components when configuration is in place. Currently #included from jrt_build -->
-<component id="javadrmutils" name="Java DRM Utils" filter="s60,sf_build">
-<!--<unit bldFile="java_stubs/jrtdrmutils/group"/>-->
-</component>
-<component id="javaenvinfo" name="Java Environment Info" filter="s60,sf_build">
-<!--<unit bldFile="java_stubs/jrtenvinfo/group"/>-->
-</component>
-<component id="javaregistry" filter="s60,sf_build" name="Java Registry">
-<!--<unit bldFile="java_stubs/jrtregistry/clientserver/client/group"/>-->
-</component>
-<component id="java_stubs_build" filter="s60,sf_build" name="Java Stubs ROM">
-<!-- Remove the #includes and rename JRT ROM-->
-<!--<unit bldFile="java_stubs/group"/>-->
-</component>
-</collection>
-<collection id="jrt_info" name="JRT Info" level="rt">
-<component id="jrt_build" filter="s60" name="JRT Build">
-<!--  needed for __JAVA_STUBS condition -->
-<unit bldFile="/app/jrt/group"/>
+<component id="java_stubs_build" filter="s60" name="JRT Stubs Build">
+<unit bldFile="/app/jrt/java_stubs/group"/>
 </component>
 </collection>
 </package>