diff --git a/csharp/generate_protos.sh b/csharp/generate_protos.sh
index 9899097ddf..d979aa52be 100755
--- a/csharp/generate_protos.sh
+++ b/csharp/generate_protos.sh
@@ -6,7 +6,7 @@
 set -ex
 
 # cd to repository root
-cd $(dirname $0)/..
+pushd $(dirname $0)/..
 
 # Protocol buffer compiler to use. If the PROTOC variable is set,
 # use that. Otherwise, probe for expected locations under both
diff --git a/generate_descriptor_proto.sh b/generate_descriptor_proto.sh
index 44006b2c2d..81b8a0d648 100755
--- a/generate_descriptor_proto.sh
+++ b/generate_descriptor_proto.sh
@@ -96,3 +96,8 @@ if test -x objectivec/generate_descriptors_proto.sh; then
   echo "Generating messages for objc."
   objectivec/generate_descriptors_proto.sh $@
 fi
+
+if test -x csharp/generate_protos.sh; then
+  echo "Generating messages for C#."
+  csharp/generate_protos.sh $@
+fi