diff --git a/reflect/Assembly.cs b/reflect/Assembly.cs
index c5760a62..fd1a5684 100644
--- a/reflect/Assembly.cs
+++ b/reflect/Assembly.cs
@@ -230,9 +230,14 @@ namespace IKVM.Reflection
 			get { return false; }
 		}
 
-		public virtual AssemblyNameFlags __AssemblyFlags
+		public AssemblyNameFlags __AssemblyFlags
 		{
-			get { return GetName().Flags; }
+			get { return GetAssemblyFlags(); }
+		}
+
+		protected virtual AssemblyNameFlags GetAssemblyFlags()
+		{
+			return GetName().Flags;
 		}
 
 		internal abstract IList<CustomAttributeData> GetCustomAttributesData(Type attributeType);
diff --git a/reflect/Emit/AssemblyBuilder.cs b/reflect/Emit/AssemblyBuilder.cs
index 711cbac8..910a6db8 100644
--- a/reflect/Emit/AssemblyBuilder.cs
+++ b/reflect/Emit/AssemblyBuilder.cs
@@ -180,16 +180,26 @@ namespace IKVM.Reflection.Emit
 			this.hashAlgorithm = hashAlgorithm;
 		}
 
+		[Obsolete("Use __AssemblyFlags property instead.")]
 		public void __SetAssemblyFlags(AssemblyNameFlags flags)
 		{
-			AssemblyName oldName = GetName();
-			this.flags = flags;
-			Rename(oldName);
+			this.__AssemblyFlags = flags;
 		}
 
-		public override AssemblyNameFlags __AssemblyFlags
+		protected override AssemblyNameFlags GetAssemblyFlags()
+		{
+			return flags;
+		}
+
+		public new AssemblyNameFlags __AssemblyFlags
 		{
 			get { return flags; }
+			set
+			{
+				AssemblyName oldName = GetName();
+				this.flags = value;
+				Rename(oldName);
+			}
 		}
 
 		internal string Name
diff --git a/reflect/Reader/AssemblyReader.cs b/reflect/Reader/AssemblyReader.cs
index 0004862e..0fbe5761 100644
--- a/reflect/Reader/AssemblyReader.cs
+++ b/reflect/Reader/AssemblyReader.cs
@@ -259,9 +259,9 @@ namespace IKVM.Reflection.Reader
 			return manifestModule.__GetReferencedAssemblies();
 		}
 
-		public override AssemblyNameFlags __AssemblyFlags
+		protected override AssemblyNameFlags GetAssemblyFlags()
 		{
-			get { return (AssemblyNameFlags)manifestModule.AssemblyTable.records[0].Flags; }
+			return (AssemblyNameFlags)manifestModule.AssemblyTable.records[0].Flags;
 		}
 
 		internal string Name