diff --git a/BuildServer/lib/tasks/dotnetbuild.js b/BuildServer/lib/tasks/dotnetbuild.js
index 97bddb9..8cee327 100644
--- a/BuildServer/lib/tasks/dotnetbuild.js
+++ b/BuildServer/lib/tasks/dotnetbuild.js
@@ -9,7 +9,10 @@ module.exports = function (params, processor) {
 				type: "dotnetcheckstyle"
 			},
 			{
-				type: "dotnetrewrite"
+				type: "dotnetrewrite",
+				params: {
+					skipCodeSigning: params.skipCodeSigning
+				}
 			},
 			{
 				type: "dotnetbuilderwrapper",
diff --git a/BuildServer/lib/tasks/dotnetpack.js b/BuildServer/lib/tasks/dotnetpack.js
index 525d1b4..883940b 100644
--- a/BuildServer/lib/tasks/dotnetpack.js
+++ b/BuildServer/lib/tasks/dotnetpack.js
@@ -7,6 +7,9 @@ module.exports = function (params, processor) {
 		tasks: [
 			{
 				type: "dotnetrewrite",
+				params: {
+					skipCodeSigning: params.skipCodeSigning
+				}
 			},
 			{
 				type: "dotnetbuilderwrapper",
diff --git a/BuildServer/lib/tasks/dotnetrewrite.js b/BuildServer/lib/tasks/dotnetrewrite.js
index 1c8cb60..68b47e0 100644
--- a/BuildServer/lib/tasks/dotnetrewrite.js
+++ b/BuildServer/lib/tasks/dotnetrewrite.js
@@ -3,6 +3,7 @@
 var fs = require('fs');
 var async = require('async');
 var glob = require('glob');
+var settings = require('../../settings');
 
 module.exports = function (params, processor) {
 	return {
@@ -22,7 +23,10 @@ module.exports = function (params, processor) {
 					"repository: " + processor.context.owner + "/" + processor.context.reponame + "; " +
 					"branch: " + processor.context.branch + ")";
 
-			var textToAppend = "\r\n[assembly: AssemblyInformationalVersion(\"" + version + "\")]\r\n"
+			var textToAppend = "\r\n[assembly: AssemblyInformationalVersion(\"" + version + "\")]\r\n";
+			if (!params.skipCodeSigning && !settings.skipCodeSigning) {
+				textToAppend += "[assembly: AssemblyKeyFileAttribute(\"" + settings.codeSigningKey + "\")]\r\n";
+			}
 
 			glob("**/AssemblyInfo.cs", {cwd: processor.context.exported}, function (err, files) {
 				if (err) {