diff --git a/index.html b/index.html
index 9798404..6d7072b 100644
--- a/index.html
+++ b/index.html
@@ -71,7 +71,8 @@ the underlying directory structure and file attributes.</p>
 
 <h2><a name="status"></a>Status</h2>
 
-<p>Current version is 1.5.0. It was developed for Lua 5.1.</p>
+<p>Current version is 1.6.0. It was developed for Lua 5.1 but also
+  works with Lua 5.2.</p>
 
 <h2><a name="download"></a>Download</h2>
 
@@ -82,6 +83,12 @@ page.</p>
 <h2><a name="history"></a>History</h2>
 
 <dl class="history">
+	<dt><strong>Version 1.6.0</strong> [26/Sep/2012]</dt>
+       <li>getcwd fix for Android</li>
+        <li>support for Lua 5.2</li>
+        <li>add lfs.link</li>
+        <li>other bug fixes</li>
+ 
 	<dt><strong>Version 1.5.0</strong> [20/Oct/2009]</dt>
 	<li>Added explicit next and close methods to second return value of lfs.dir 
 (the directory object), for explicit iteration or explicit closing.</li>
diff --git a/manual.html b/manual.html
index aa51b73..996dc1f 100644
--- a/manual.html
+++ b/manual.html
@@ -172,12 +172,14 @@ LuaFileSystem offers the following functions:
     Returns <code>true</code> in case of success or <code>nil</code> plus an
     error string.</dd>
 
-    <dt><a name="chdir"></a><strong><code>lfs.lock_dir(path)</code></strong></dt>
+    <dt><a name="chdir"></a><strong><code>lfs.lock_dir(path, [seconds_stale])</code></strong></dt>
     <dd>Creates a lockfile (called lockfile.lfs) in <code>path</code> if it does not
-  exist and returns the lock. 
-   To free the the lock call <code>lock:free()</code>. <br/>
+  exist and returns the lock. If the lock already exists checks if
+  it's stale, using the second parameter (default for the second
+  parameter is <code>INT_MAX</code>, which in practice means the lock will never
+  be stale. To free the the lock call <code>lock:free()</code>. <br/>
    In case of any errors it returns nil and the error message. In
-  particular, if the lock exists it returns the
+  particular, if the lock exists and is not stale it returns the
   "File exists" message.</dd>
         
     <dt><a name="getcwd"></a><strong><code>lfs.currentdir ()</code></strong></dt>
@@ -204,6 +206,13 @@ LuaFileSystem offers the following functions:
     Returns <code>true</code> if the operation was successful; in
     case of error, it returns <code>nil</code> plus an error string.
     </dd>
+
+    <dt><a name="link"></a><strong><code>lfs.link (old, new[, symlink])</code></strong></dt>
+    <dd>Creates a link. The first argument is the object to link to
+    and the second is the name of the link. If the optional third
+    argument is true, the link will by a symbolic link (by default, a
+    hard link is created).
+    </dd>
     
     <dt><a name="mkdir"></a><strong><code>lfs.mkdir (dirname)</code></strong></dt>
     <dd>Creates a new directory. The argument is the name of the new
@@ -219,15 +228,15 @@ LuaFileSystem offers the following functions:
 
     <dt><a name="setmode"></a><strong><code>lfs.setmode (file, mode)</code></strong></dt>
     <dd>Sets the writing mode for a file. The mode string can be either <code>binary</code> or <code>text</code>.
-    Returns the previous mode string for the file. This function is only available in Windows, so you may want to make sure that
-    <code>lfs.setmode</code> exists before using it.
+    Returns the previous mode string for the file. On non-Windows platforms, where the two modes are identical,
+    setting the mode has no effect, and the mode is always returned as <code>binary</code>.
     </dd>
     
     <dt><a name="symlinkattributes"></a><strong><code>lfs.symlinkattributes (filepath [, aname])</code></strong></dt>
     <dd>Identical to <a href="#attributes">lfs.attributes</a> except that
     it obtains information about the link itself (not the file it refers to).
-    This function is not available in Windows so you may want to make sure that
-    <code>lfs.symlinkattributes</code> exists before using it.
+    On Windows this function does not yet support links, and is identical to
+    <code>lfs.attributes</code>.
     </dd>
 
     <dt><a name="touch"></a><strong><code>lfs.touch (filepath [, atime [, mtime]])</code></strong></dt>