diff --git a/evently/wiki/edit/partials/help.html b/evently/wiki/edit/partials/help.html
index 7e9660d..e2f0a3c 100644
--- a/evently/wiki/edit/partials/help.html
+++ b/evently/wiki/edit/partials/help.html
@@ -11,6 +11,8 @@ <h3>Markdown basics:</h3>
 This is a paragraph, which is text surrounded by whitespace. Paragraphs 
 can be on one line (or many), and can drone on for hours.  
 
+### Links
+
 Here is a Markdown link to [Apache CouchDB](http://couchdb.apache.org), 
 and a literal &lt;http://link.com/&gt;.
 
@@ -21,6 +23,10 @@ <h3>Markdown basics:</h3>
 
 Here's a link to [the wiki home page](index).
 
+You can also create links with CamelCase or with [[double-bracket-links]]
+
+### Emphasis
+
 Now some inline markup like _italics_, **bold**, and `code()`.
 
 ### Images are easy
diff --git a/lib/wiki.js b/lib/wiki.js
index 56327f6..e0d1add 100644
--- a/lib/wiki.js
+++ b/lib/wiki.js
@@ -2,7 +2,7 @@ var markdown = require("vendor/couchapp/lib/markdown");
 
 function wikilinks(text) {
   return text.replace(/\[\[(.*)\]\]/g,"[$1]($1)").
-    replace(/(^|\W)([A-Z]\w*[A-Z]\w*)(\W|$)/gm,"$1[$2]($2)");
+    replace(/(^|\s)([A-Z][a-z]\w*[A-Z][a-z]\w*)(\s|$)/gm,"$1[$2]($2)$3");
 };
 
 exports.encode = function(text) {