diff --git a/AST/Expr.cpp b/AST/Expr.cpp
index f979c7a..00ff897 100644
--- a/AST/Expr.cpp
+++ b/AST/Expr.cpp
@@ -357,6 +357,10 @@
   if (TR->isFunctionType()) // from isObjectType()
     return LV_NotObjectType;
 
+  // Allow qualified void which is an incomplete type other than void (yuck).
+  if (TR->isVoidType() && !TR.getQualifiers())
+    return LV_IncompleteVoidType;
+
   if (TR->isReferenceType()) // C++ [expr]
     return LV_Valid;
 
diff --git a/test/Sema/deref.c b/test/Sema/deref.c
index 7efb55e..8f8156d 100644
--- a/test/Sema/deref.c
+++ b/test/Sema/deref.c
@@ -17,7 +17,7 @@
 void foo3 (void)
 {
  void* x = 0;
- void* y = &*x;
+ void* y = &*x; // expected-error{{address expression must be an lvalue or a function designator}}
 }
 
 extern const void cv1;
@@ -26,3 +26,8 @@
   return &cv1;
 }
 
+extern void cv2;
+void *foo5 (void)
+{
+  return &cv2; // expected-error{{address expression must be an lvalue or a function designator}}
+}