diff -ur original/openssl/apps/progs.pl work/openssl/apps/progs.pl
--- original/openssl/apps/progs.pl	2015-01-19 12:03:41.000000000 +0100
+++ work/openssl/apps/progs.pl	2015-01-19 12:07:06.000000000 +0100
@@ -53,6 +53,8 @@
 		{ print "#ifndef OPENSSL_NO_OCSP\n${str}#endif\n"; }
 	elsif ( ($_ =~ /^srp$/))
 		{ print "#ifndef OPENSSL_NO_SRP\n${str}#endif\n"; }
+	elsif ( ($_ =~ /^ts$/))
+		{ print "#ifndef OPENSSL_NO_TS\n${str}#endif\n"; }
 	else
 		{ print $str; }
 	}
diff -ur original/openssl/apps/ts.c work/openssl/apps/ts.c
--- original/openssl/apps/ts.c	2015-01-19 12:03:41.000000000 +0100
+++ work/openssl/apps/ts.c	2015-01-19 12:07:54.000000000 +0100
@@ -56,6 +56,8 @@
  *
  */
 
+#include <openssl/opensslconf.h>
+#ifndef OPENSSL_NO_TS
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
@@ -1146,3 +1148,10 @@
 
 	return ok;
 	}
+#else /* !OPENSSL_NO_TS */
+
+# if PEDANTIC
+static void *dummy=&dummy;
+# endif
+
+#endif