diff --git a/lib/Sema/SemaDecl.cpp b/lib/Sema/SemaDecl.cpp
index d6137e5..432354c 100644
--- a/lib/Sema/SemaDecl.cpp
+++ b/lib/Sema/SemaDecl.cpp
@@ -8079,6 +8079,9 @@
   if (NewFD->isInvalidDecl())
     Record->setInvalidDecl();
 
+  if (D.getDeclSpec().isModulePrivateSpecified())
+    NewFD->setModulePrivate();
+  
   if (NewFD->isInvalidDecl() && PrevDecl) {
     // Don't introduce NewFD into scope; there's already something
     // with the same name in the same scope.
@@ -8556,6 +8559,9 @@
   if (getLangOptions().ObjCAutoRefCount && inferObjCARCLifetime(NewID))
     NewID->setInvalidDecl();
 
+  if (D.getDeclSpec().isModulePrivateSpecified())
+    NewID->setModulePrivate();
+  
   if (II) {
     // FIXME: When interfaces are DeclContexts, we'll need to add
     // these to the interface.
diff --git a/test/Modules/module-private.cpp b/test/Modules/module-private.cpp
index 4421538..949d795 100644
--- a/test/Modules/module-private.cpp
+++ b/test/Modules/module-private.cpp
@@ -40,6 +40,12 @@
 inline void test_f0_in_right() {
   double &dr = f0(hidden_var);
 }
+
+struct VisibleStruct {
+  __module_private__ int field;
+  __module_private__ void setField(int f);
+};
+
 #else
 __import_module__ left;
 __import_module__ right;
@@ -60,6 +66,10 @@
   // expected-error{{expected '(' for function-style cast or type construction}} \
   // expected-error{{use of undeclared identifier 'vec'}}
 
+  VisibleStruct vs;
+  vs.field = 0; // expected-error{{no member named 'field' in 'VisibleStruct'}}
+  vs.setField(1); // expected-error{{no member named 'setField' in 'VisibleStruct'}}
+
   return hidden_var; // expected-error{{use of undeclared identifier 'hidden_var'}}
 }