diff --git a/lib/Parse/ParseTentative.cpp b/lib/Parse/ParseTentative.cpp
index ccaae6d..3c50884 100644
--- a/lib/Parse/ParseTentative.cpp
+++ b/lib/Parse/ParseTentative.cpp
@@ -399,7 +399,8 @@
   //   ptr-operator declarator
 
   while (1) {
-    if (Tok.is(tok::star) || Tok.is(tok::amp)) {
+    if (Tok.is(tok::star) || Tok.is(tok::amp) || 
+        (Tok.is(tok::caret) && getLang().Blocks)) {
       // ptr-operator
       ConsumeToken();
       while (Tok.is(tok::kw_const)    ||