diff --git a/src/csharp/GrpcApi/TestServiceGrpc.cs b/src/csharp/GrpcApi/TestServiceGrpc.cs
index e836d604929..067b21c252c 100644
--- a/src/csharp/GrpcApi/TestServiceGrpc.cs
+++ b/src/csharp/GrpcApi/TestServiceGrpc.cs
@@ -1,3 +1,35 @@
+#region Copyright notice and license
+
+// Copyright 2015, Google Inc.
+// All rights reserved.
+// 
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions are
+// met:
+// 
+//     * Redistributions of source code must retain the above copyright
+// notice, this list of conditions and the following disclaimer.
+//     * Redistributions in binary form must reproduce the above
+// copyright notice, this list of conditions and the following disclaimer
+// in the documentation and/or other materials provided with the
+// distribution.
+//     * Neither the name of Google Inc. nor the names of its
+// contributors may be used to endorse or promote products derived from
+// this software without specific prior written permission.
+// 
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+#endregion
 using System;
 using System.Threading;
 using System.Threading.Tasks;
@@ -167,4 +199,4 @@ namespace grpc.testing
             return new TestServiceClientStub(channel);
         }
     }
-}
\ No newline at end of file
+}
diff --git a/tools/distrib/check_copyright.py b/tools/distrib/check_copyright.py
index 8a61626d15a..ac54a2e9a44 100755
--- a/tools/distrib/check_copyright.py
+++ b/tools/distrib/check_copyright.py
@@ -57,6 +57,7 @@ LICENSE_FMT = {
   '.sh': '# %s',
   '.proto': '// %s',
   '.js': ' * %s',
+  '.cs': '// %s',
 }
 
 # pregenerate the actual text that we should have
@@ -71,7 +72,9 @@ OLD_LICENSE_TEXT = dict(
 for filename in subprocess.check_output('git ls-tree -r --name-only -r HEAD',
                                         shell=True).splitlines():
   ext = os.path.splitext(filename)[1]
-  if ext not in LICENSE_TEXT: continue
+  if ext not in LICENSE_TEXT: 
+    #print 'pass: %s' % filename
+    continue
   license = LICENSE_TEXT[ext]
   old_license = OLD_LICENSE_TEXT[ext]
   with open(filename) as f:
@@ -81,6 +84,6 @@ for filename in subprocess.check_output('git ls-tree -r --name-only -r HEAD',
   elif old_license in text:
     pass
     #print 'old license in: %s' % filename
-  elif 'DO NOT EDIT' not in text:
+  elif 'DO NOT EDIT' not in text and 'AssemblyInfo.cs' not in filename:
     print 'no license in: %s' % filename