Index: CPythonLib.includes
===================================================================
--- CPythonLib.includes	(revision 3799)
+++ CPythonLib.includes	(working copy)
@@ -79,6 +79,7 @@
 pickle.py
 pickletools.py
 pipes.py
+platform.py
 poplib.py
 posixfile.py
 posixpath.py
Index: src/org/python/core/PySystemState.java
===================================================================
--- src/org/python/core/PySystemState.java	(revision 3799)
+++ src/org/python/core/PySystemState.java	(working copy)
@@ -346,6 +346,8 @@
     }
 
     public static void determinePlatform(Properties props) {
+        platform = System.getProperty("os.name");
+        if (platform == null ){
         String version = props.getProperty("java.version");
         if (version == null) {
             version = "???";
@@ -361,6 +363,7 @@
             version = "1.2";
         }
         platform = "java" + version;
+        }
     }
 
     private static void initRegistry(Properties preProperties, Properties postProperties, 
Index: src/org/python/util/InteractiveConsole.java
===================================================================
--- src/org/python/util/InteractiveConsole.java	(revision 3799)
+++ src/org/python/util/InteractiveConsole.java	(working copy)
@@ -61,7 +61,7 @@
     }
 
     public static String getDefaultBanner() {
-        return "Jython " + PySystemState.version + " on " + PySystemState.platform;
+        return "Jython " + PySystemState.version + "[Java "+System.getProperty("java.version") +"]"+ " on " +  PySystemState.platform;
     }
 
     public void interact(String banner) {
Index: Lib/test/test_platform.py
===================================================================
--- Lib/test/test_platform.py	(revision 0)
+++ Lib/test/test_platform.py	(revision 0)
@@ -0,0 +1,79 @@
+import unittest
+from test import test_support
+import platform
+
+class PlatformTest(unittest.TestCase):
+#    def test_architecture(self):
+#        res = platform.architecture()
+
+    def test_machine(self):
+        res = platform.machine()
+	
+    def test_node(self):
+        res = platform.node()
+	
+#    def test_platform(self):
+#        for aliased in (False, True):
+#            for terse in (False, True):
+#                res = platform.platform(aliased, terse)
+		
+    def test_processor(self):
+        res = platform.processor()
+	
+#    def test_python_build(self):
+#        res = platform.python_build()
+	
+#    def test_python_compiler(self):
+#        res = platform.python_compiler()
+
+    def test_version(self):
+        res1 = platform.version()
+        res2 = platform.version_tuple()
+        self.assertEqual(res1, ".".join(res2))
+	
+    def test_release(self):
+        res = platform.release()
+
+    def test_system(self):
+        res = platform.system()
+
+    def test_version(self):
+        res = platform.version()
+
+    def test_system_alias(self):
+        res = platform.system_alias(
+            platform.system(),
+            platform.release(),
+            platform.version(),
+        )
+
+    def test_uname(self):
+        res = platform.uname()
+
+    def test_java_ver(self):
+        res = platform.java_ver()
+
+    def test_win32_ver(self):
+        res = platform.win32_ver()
+
+    def test_mac_ver(self):
+        res = platform.mac_ver()
+
+    def test_dist(self):
+        res = platform.dist()
+
+#    def test_libc_ver(self):
+#        from sys import executable
+#        import os
+#        if os.path.isdir(executable) and os.path.exists(executable+'.exe'):
+#            # Cygwin horror
+#            executable = executable + '.exe'
+#        res = platform.libc_ver(executable)
+
+def test_main():
+    test_support.run_unittest(
+        PlatformTest
+    )
+
+if __name__ == '__main__':
+    test_main()