diff --git a/lib/motion/project/template/osx/builder.rb b/lib/motion/project/template/osx/builder.rb
index e7c38d68..bd38e591 100644
--- a/lib/motion/project/template/osx/builder.rb
+++ b/lib/motion/project/template/osx/builder.rb
@@ -107,6 +107,7 @@ def codesign_bundle(config, bundle, deep = false)
         command = "/usr/bin/codesign --force --sign '#{config.codesign_certificate}' "
         command << "--deep " if deep
         command << "--entitlements '#{entitlements_path}' " if entitlements_path
+        command << "--timestamp=none " if config.codesign_disable_timestamp
         command << "'#{bundle}'"
         sh(command)
       end
diff --git a/lib/motion/project/xcode_config.rb b/lib/motion/project/xcode_config.rb
index eaba70d7..c01f4ed5 100644
--- a/lib/motion/project/xcode_config.rb
+++ b/lib/motion/project/xcode_config.rb
@@ -32,7 +32,7 @@ module Motion; module Project
   class XcodeConfig < Config
     variable :xcode_dir, :sdk_version, :deployment_target, :frameworks,
              :weak_frameworks, :embedded_frameworks, :external_frameworks, :framework_search_paths,
-             :libs, :identifier, :codesign_certificate, :short_version, :entitlements, :delegate_class, :embed_dsym,
+             :libs, :identifier, :codesign_certificate, :codesign_disable_timestamp, :short_version, :entitlements, :delegate_class, :embed_dsym,
              :version
 
     def initialize(project_dir, build_mode)
@@ -53,6 +53,7 @@ def initialize(project_dir, build_mode)
       @embed_dsym = (development? ? true : false)
       @vendor_projects = []
       @version = '1.0'
+      @codesign_disable_timestamp = (development? ? true : false)
     end
 
     def xcode_dir=(xcode_dir)