diff --git a/lib/motion/project/template/osx.rb b/lib/motion/project/template/osx.rb
index 76fe44a6..643f134d 100644
--- a/lib/motion/project/template/osx.rb
+++ b/lib/motion/project/template/osx.rb
@@ -44,7 +44,7 @@ namespace :build do
   task :release do
     App.config_without_setup.build_mode = :release
     App.build('MacOSX')
-    App.codesign('MacOSX')
+    App.codesign('MacOSX') if App.config_without_setup.codesign_for_release
   end
 end
 
diff --git a/lib/motion/project/template/osx/config.rb b/lib/motion/project/template/osx/config.rb
index 945b2c85..0cd1ae28 100644
--- a/lib/motion/project/template/osx/config.rb
+++ b/lib/motion/project/template/osx/config.rb
@@ -30,7 +30,8 @@ module Motion; module Project;
     register :osx
 
     variable :icon, :copyright, :category, :embedded_frameworks,
-        :codesign_for_development, :eval_support
+        :codesign_for_development, :codesign_for_release,
+        :eval_support
 
     def initialize(project_dir, build_mode)
       super
@@ -40,6 +41,7 @@ module Motion; module Project;
       @frameworks = ['AppKit', 'Foundation', 'CoreGraphics']
       @embedded_frameworks = []
       @codesign_for_development = false
+      @codesign_for_release = true
       @eval_support = false
     end