diff --git a/ext/bbcode/main.php b/ext/bbcode/main.php
index d30d89db..6c4d404e 100644
--- a/ext/bbcode/main.php
+++ b/ext/bbcode/main.php
@@ -39,7 +39,7 @@ class BBCode extends FormatterExtension {
 		}
 		$text = preg_replace('!^&gt;&gt;([^\d].+)!', '<blockquote><small>$1</small></blockquote>', $text);
 		$text = preg_replace('!&gt;&gt;(\d+)(#c?\d+)?!s', '<a class="shm-clink" data-clink-sel="$2" href="'.make_link('post/view/$1$2').'">&gt;&gt;$1$2</a>', $text);
-		$text = preg_replace('!\[anchor=(.*?)\](.*?)\[/anchor\]!s', '<a name="bb-$1">$2</a>', $text);  // add "bb-" to avoid clashing with eg #top
+		$text = preg_replace('!\[anchor=(.*?)\](.*?)\[/anchor\]!s', '<span class="anchor">$2 <a class="alink" href="#bb-$1" name="bb-$1" title="link to this anchor"> ¶ </a></span>', $text);  // add "bb-" to avoid clashing with eg #top
 		$text = preg_replace('!\[url=site://(.*?)(#c\d+)?\](.*?)\[/url\]!s', '<a class="shm-clink" data-clink-sel="$2" href="'.make_link('$1$2').'">$3</a>', $text);
 		$text = preg_replace('!\[url\]site://(.*?)(#c\d+)?\[/url\]!s', '<a class="shm-clink" data-clink-sel="$2" href="'.make_link('$1$2').'">$1$2</a>', $text);
 		$text = preg_replace('!\[url=((?:https?|ftp|irc|mailto)://.*?)\](.*?)\[/url\]!s', '<a href="$1">$2</a>', $text);
diff --git a/ext/bbcode/style.css b/ext/bbcode/style.css
index ef73687a..200221cc 100644
--- a/ext/bbcode/style.css
+++ b/ext/bbcode/style.css
@@ -8,3 +8,9 @@ BLOCKQUOTE {
 	padding: 8px;
 	background: #DDD;
 }
+.anchor A.alink {
+	visibility: hidden;
+}
+.anchor:hover A.alink {
+	visibility: visible;
+}
diff --git a/ext/bbcode/test.php b/ext/bbcode/test.php
index 4e3fd832..a1832653 100644
--- a/ext/bbcode/test.php
+++ b/ext/bbcode/test.php
@@ -74,7 +74,7 @@ class BBCodeUnitTest extends UnitTestCase {
 	public function testAnchor() {
 		$this->assertEqual(
 			$this->filter("[anchor=rules]Rules[/anchor]"),
-			"<a name=\"bb-rules\">Rules</a>");
+			'<span class="anchor">Rules <a class="alink" href="#bb-rules" name="bb-rules" title="link to this anchor"> ¶ </a></span>');
 	}
 
 	private function filter($in) {