diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index b6e9a2859..51b2f6b91 100755
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,10 @@
+2010-02-08  Carsten Dominik  <carsten.dominik@gmail.com>
+
+	* org.el (org-fontify-meta-lines-and-blocks): Honor
+	`org-fontify-quote-and-verse-blocks'.
+
+	* org-faces.el (org-fontify-quote-and-verse-blocks): New option.
+
 2010-02-03  Carsten Dominik  <carsten.dominik@gmail.com>
 
 	* org.el (org-open-at-point): Also check for text property
diff --git a/lisp/org-faces.el b/lisp/org-faces.el
index 093905a1d..4921f6c90 100644
--- a/lisp/org-faces.el
+++ b/lisp/org-faces.el
@@ -474,6 +474,13 @@ changes."
 (org-copy-face 'org-block 'org-verse
    "Face for #+BEGIN_VERSE ... #+END_VERSE blocks.")
 
+(defcustom org-fontify-quote-and-verse-blocks nil
+  "Non-nil means, add a special face to #+begin_quote and #+begin_verse block.
+When nil, format these as normal Org.  This is the default, because the
+content of these blocks will still be treated as Org syntax."
+  :group 'org-faces
+  :type 'boolean)
+
 (defface org-clock-overlay ;; copied from secondary-selection
   (org-compatible-face nil
     '((((class color) (min-colors 88) (background light))
diff --git a/lisp/org.el b/lisp/org.el
index cb91ae365..9134e1d9e 100644
--- a/lisp/org.el
+++ b/lisp/org.el
@@ -4635,6 +4635,7 @@ will be prompted for."
 	      (cond
 	       (quoting
 		(add-text-properties beg1 end1 '(face org-block)))
+	       ((not org-fontify-quote-and-verse-blocks))
 	       ((string= block-type "quote")
 		(add-text-properties beg1 end1 '(face org-quote)))
 	       ((string= block-type "verse")