diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index b696ad971a0..23aeac84ca5 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,4 +1,9 @@
-2008-09-19  Miles Bader  <Miles Bader <miles@gnu.org>>
+2008-09-19  Martin Rudalics  <rudalics@gmx.at>
+
+	* textmodes/sgml-mode.el (sgml-tag-syntax-table): Remove prefix
+	flag from "'" entry in sgml-tag-syntax-table.  (Bug#946)
+
+2008-09-19  Miles Bader  <miles@gnu.org>
 
 	* comint.el (comint-output-filter): Make field properties for
 	output text front-sticky.
diff --git a/lisp/textmodes/sgml-mode.el b/lisp/textmodes/sgml-mode.el
index 67ed335a9c0..9310e760907 100644
--- a/lisp/textmodes/sgml-mode.el
+++ b/lisp/textmodes/sgml-mode.el
@@ -158,6 +158,9 @@ This takes effect when first loading the `sgml-mode' library.")
   (let ((table (sgml-make-syntax-table sgml-specials)))
     (dolist (char '(?\( ?\) ?\{ ?\} ?\[ ?\] ?$ ?% ?& ?* ?+ ?/))
       (modify-syntax-entry char "." table))
+    (unless (memq ?' sgml-specials)
+      ;; Avoid that skipping a tag backwards skips any "'" prefixing it.
+      (modify-syntax-entry ?' "w" table))
     table)
   "Syntax table used to parse SGML tags.")