diff --git a/src/Microsoft.AspNet.Hosting.Interfaces/Properties/AssemblyInfo.cs b/src/Microsoft.AspNet.Hosting.Interfaces/Properties/AssemblyInfo.cs
new file mode 100644
index 0000000000..f5c6f4a83a
--- /dev/null
+++ b/src/Microsoft.AspNet.Hosting.Interfaces/Properties/AssemblyInfo.cs
@@ -0,0 +1,6 @@
+// Copyright (c) Microsoft Open Technologies, Inc. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+using System.Reflection;
+
+[assembly: AssemblyMetadata("Serviceable", "True")]
\ No newline at end of file
diff --git a/src/Microsoft.AspNet.Hosting/Properties/AssemblyInfo.cs b/src/Microsoft.AspNet.Hosting/Properties/AssemblyInfo.cs
new file mode 100644
index 0000000000..f5c6f4a83a
--- /dev/null
+++ b/src/Microsoft.AspNet.Hosting/Properties/AssemblyInfo.cs
@@ -0,0 +1,6 @@
+// Copyright (c) Microsoft Open Technologies, Inc. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+using System.Reflection;
+
+[assembly: AssemblyMetadata("Serviceable", "True")]
\ No newline at end of file
diff --git a/src/Microsoft.AspNet.TestHost/Properties/AssemblyInfo.cs b/src/Microsoft.AspNet.TestHost/Properties/AssemblyInfo.cs
index 5eb8f1ffac..23c410c805 100644
--- a/src/Microsoft.AspNet.TestHost/Properties/AssemblyInfo.cs
+++ b/src/Microsoft.AspNet.TestHost/Properties/AssemblyInfo.cs
@@ -35,4 +35,5 @@ using System.Runtime.InteropServices;
 // The following GUID is for the ID of the typelib if this project is exposed to COM
 [assembly: Guid("12A3EDBB-65B6-4D47-98FC-2B80CEC71E51")]
 
-[assembly: InternalsVisibleTo("Microsoft.AspNet.TestHost.Tests")]
\ No newline at end of file
+[assembly: InternalsVisibleTo("Microsoft.AspNet.TestHost.Tests")]
+[assembly: AssemblyMetadata("Serviceable", "True")]