diff -r 6ce4074faba4 nbbuild/antsrc/org/netbeans/nbbuild/MakeNBM.java
--- a/nbbuild/antsrc/org/netbeans/nbbuild/MakeNBM.java	Sun Aug 21 16:50:17 2016 +0300
+++ b/nbbuild/antsrc/org/netbeans/nbbuild/MakeNBM.java	Tue Aug 23 00:22:29 2016 +0300
@@ -290,6 +290,7 @@
     public /*static*/ class Signature {
         public File keystore;
         public String storepass, alias;
+        public String tsaurl, tsacert;
         /** Path to the keystore (private key). */
         public void setKeystore(File f) {
             keystore = f;
@@ -305,6 +306,14 @@
         public void setAlias(String s) {
             alias = s;
         }
+	/** Time Stamping Authority (TSA) URL */
+	public void setTsaurl(String s) {
+	    tsaurl = s;
+	}
+	/** Alias for the TSA's public key certificate */
+	public void setTsacert(String s) {
+	    tsacert = s;
+	}
     }
     
     private File productDir = null;
@@ -865,6 +874,12 @@
                 } catch (Exception x) {
                     throw new BuildException(x);
                 }
+                if(signature.tsaurl != null && !signature.tsaurl.isEmpty()) {
+                    signjar.setTsaurl(signature.tsaurl);
+                }
+                if(signature.tsacert != null && !signature.tsacert.isEmpty()) {
+                    signjar.setTsacert(signature.tsacert);
+                }
                 signjar.setStorepass (signature.storepass);
                 signjar.setAlias (signature.alias);
                 signjar.setLocation(getLocation());
diff -r 6ce4074faba4 nbbuild/templates/common.xml
--- a/nbbuild/templates/common.xml	Sun Aug 21 16:50:17 2016 +0300
+++ b/nbbuild/templates/common.xml	Tue Aug 23 00:22:29 2016 +0300
@@ -106,6 +106,16 @@
             <available file="${nbplatform.active.dir}/platform/core/asm-all-5.0.1.jar"/>
         </condition>
         <property name="asm.jar" location="${libs.asm.dir}/core/asm-all-5.0.1.jar"/>
+        <condition property="tsaurl" value="">
+            <not>
+                <isset property="tsaurl" />
+            </not>
+        </condition>
+        <condition property="tsacert" value="">
+            <not>
+                <isset property="tsacert" />
+            </not>
+        </condition>
     </target>
 
     <target name="-release.dir">
@@ -472,7 +482,7 @@
                  locales="${nbm.locales}"
                  >
             <license file="${license.file.override}"/>
-            <signature keystore="${keystore}" storepass="${storepass}" alias="${nbm_alias}"/>
+            <signature keystore="${keystore}" storepass="${storepass}" alias="${nbm_alias}" tsaurl="${tsaurl}" tsacert="${tsacert}"/>
             <updaterjar>
                 <pathfileset>
                     <path refid="cluster.path.id"/>