diff --git a/CHANGELOG b/CHANGELOG
index 171beb5130..217a87d9ac 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -2,6 +2,10 @@ This is not a complete list of changes, just of API or workflow changes that may
 break existing installs. Newer changes are listed at the top. If you pull new
 changes and things stop working, check here first!
 
+July 18 2011 - Phriction Link Syntax Change
+  Phriction link sytnax now requires [[double brackets]], not single
+  brackets.
+
 June 29 2011 - Maniphest project indexes
   Old Maniphest tasks will not appear in project filter views until you run
   "scripts/search/reindex_maniphest.php" to build indexes. New tasks will have
diff --git a/src/docs/userguide/remarkup.diviner b/src/docs/userguide/remarkup.diviner
index 034b965eb5..4bb3ab6b79 100644
--- a/src/docs/userguide/remarkup.diviner
+++ b/src/docs/userguide/remarkup.diviner
@@ -147,9 +147,9 @@ if they aren't already CC'd.
 
 You can link to Phriction documents with a name or path:
 
-  Make sure you sign and date your [legal/Letter of Marque and Reprisal]!
+  Make sure you sign and date your [[legal/Letter of Marque and Reprisal]]!
 
 With a pipe (##|##), you can retitle the link. Use this to mislead your
 opponents:
 
-  Check out these [legal/boring_documents/ | exciting legal documents]!
+  Check out these [[legal/boring_documents/ | exciting legal documents]]!
diff --git a/src/infrastructure/markup/remarkup/markuprule/phriction/PhabricatorRemarkupRulePhriction.php b/src/infrastructure/markup/remarkup/markuprule/phriction/PhabricatorRemarkupRulePhriction.php
index b33bc3c941..66259dbafa 100644
--- a/src/infrastructure/markup/remarkup/markuprule/phriction/PhabricatorRemarkupRulePhriction.php
+++ b/src/infrastructure/markup/remarkup/markuprule/phriction/PhabricatorRemarkupRulePhriction.php
@@ -24,7 +24,7 @@ class PhabricatorRemarkupRulePhriction
 
   public function apply($text) {
     return preg_replace_callback(
-      '@\B\\[([^|\\]]+)(?:\\|([^\\]]+))?\\]\B@U',
+      '@\B\\[\\[([^|\\]]+)(?:\\|([^\\]]+))?\\]\\]\B@U',
       array($this, 'markupDocumentLink'),
       $text);
   }