diff --git a/README.html b/README.html
index f73771e9..bd9dd7cf 100644
--- a/README.html
+++ b/README.html
@@ -886,6 +886,7 @@ Files are no longer hosted at LuaForge.
 
 <tr valign="top"><td>&nbsp;&nbsp;<b>3.0-beta2</b></td><td><ul>
 <li>LuaValue.checkfunction() now returns LuaFunction.</li>
+<li>Fix os.time() to return a number of seconds.</li>
 
 </ul></td></tr>
 </table></td></tr></table>
@@ -894,10 +895,12 @@ Files are no longer hosted at LuaForge.
 <ul>
 <li>debug code may not be completely removed by some obfuscators
 <li>tail calls are not tracked in debug information
-<li>using both version 1 and 2 libraries together in the same java vm has not been tested
+<li>mixing major versions in the same java vm has not been tested
 <li>values associated with weak keys may linger longer than expected
 <li>behavior of luaj when a SecurityManager is used has not been fully characterized
 <li>negative zero is treated as identical to integer value zero throughout luaj
 <li>lua compiled into java bytecode using luajc cannot use string.dump() or xpcall()
+<li>number formatting with string.format() is not supported
+<li>date formatting with os.date() is not supported
 </ul>
 
diff --git a/src/core/org/luaj/vm2/lib/OsLib.java b/src/core/org/luaj/vm2/lib/OsLib.java
index 4f6484b8..78257fdc 100644
--- a/src/core/org/luaj/vm2/lib/OsLib.java
+++ b/src/core/org/luaj/vm2/lib/OsLib.java
@@ -304,8 +304,8 @@ public class OsLib extends TwoArgFunction {
 	 * @param table
 	 * @return long value for the time
 	 */
-	protected long time(LuaTable table) {
-		return System.currentTimeMillis();
+	protected double time(LuaTable table) {
+		return System.currentTimeMillis() / 1000.0;
 	}
 
 	/**