diff --git a/lisp/org.el b/lisp/org.el
index 8d216be79..b88b49a10 100644
--- a/lisp/org.el
+++ b/lisp/org.el
@@ -5519,9 +5519,8 @@ on a string that terminates immediately after the date.")
 				 org-ts-regexp "\\)?")
   "Regular expression matching a time stamp or time stamp range.")
 (defconst org-tsr-regexp-both
-  (concat "[^][]\\(" ;; Don't activate dates in links
-	  org-ts-regexp-both "\\(--?-?"
-	  org-ts-regexp-both "\\)?\\)")
+  (concat org-ts-regexp-both "\\(--?-?"
+	  org-ts-regexp-both "\\)?")
   "Regular expression matching a time stamp or time stamp range.
 The time stamps may be either active or inactive.")
 
@@ -5828,7 +5827,8 @@ by a #."
 
 (defun org-activate-dates (limit)
   "Run through the buffer and add overlays to dates."
-  (if (re-search-forward org-tsr-regexp-both limit t)
+  (if (and (re-search-forward org-tsr-regexp-both limit t)
+	   (not (equal (char-before (match-beginning 0)) 91)))
       (progn
 	(org-remove-flyspell-overlays-in (match-beginning 1) (match-end 1))
 	(add-text-properties (match-beginning 1) (match-end 1)
@@ -6048,7 +6048,7 @@ needs to be inserted at a specific position in the font-lock sequence.")
 	   (if (memq 'plain lk) '(org-activate-plain-links))
 	   (if (memq 'bracket lk) '(org-activate-bracket-links (0 'org-link t)))
 	   (if (memq 'radio lk) '(org-activate-target-links (0 'org-link t)))
-	   (if (memq 'date lk) '(org-activate-dates (1 'org-date t)))
+	   (if (memq 'date lk) '(org-activate-dates (0 'org-date t)))
 	   (if (memq 'footnote lk) '(org-activate-footnote-links))
 	   '("^&?%%(.*\\|<%%([^>\n]*?>" (0 'org-sexp-date t))
 	   '(org-hide-wide-columns (0 nil append))