--- a/build/makefile.javaversion	Thu Jun 17 22:39:53 2010 +0100
+++ b/build/makefile.javaversion	Fri Jun 18 16:25:31 2010 +0100
@@ -1,6 +1,2 @@
 # Set Java version (must be dot separated, without spaces)
-ifdef RD_JAVA_S60_RELEASE_5_0_IAD
-  JAVA_VERSION = 2.1.24
-else 
-  JAVA_VERSION = 2.1.24
-endif
+JAVA_VERSION = 2.2.1