diff --git a/classes/export/generate1.php b/classes/export/generate1.php
index 135aab2..5f70851 100755
--- a/classes/export/generate1.php
+++ b/classes/export/generate1.php
@@ -90,7 +90,7 @@
 $timestamp = date("Ymdhis");
 
 # Generate Orion language packs
-exec("/usr/bin/php generate_orion.php -b $build_id");
+exec("/usr/bin/php generate_orion.php -b $build_id -s $timestamp");
 
 # Generate Babel language packs
 exec("rm -rf $tmp_dir; rm -rf $output_dir");
diff --git a/classes/export/generate_orion.php b/classes/export/generate_orion.php
index 4dbbb9c..74fe14e 100644
--- a/classes/export/generate_orion.php
+++ b/classes/export/generate_orion.php
@@ -23,7 +23,7 @@
   $train_result[$train_row['train_id']] = $train_row['train_version'];
 }
 
-$options = getopt("b:t:");
+$options = getopt("b:t:s:");
 $argv_train = "";
 if (isset($options['t'])) {
 	$argv_train = $options['t'];
@@ -37,6 +37,12 @@
 	}
 }
 
+if (isset($options['s'])) {
+	$timestamp = $options['s'];
+} else {
+	$timestamp = date("Ymdhis");
+}
+
 $build_id = "";
 if (!isset($options['b'])) {
 	usage();
@@ -55,7 +61,6 @@
 $babel_source_files_dir = dirname(__FILE__) . "/source_files_for_generate/";
 
 $leader = ". ";
-$timestamp = date("Ymdhis");
 
 $rm_command = "rm -rf $orion_language_packs_dir";
 exec($rm_command);
@@ -356,7 +361,7 @@
 	echo "\n";
 	echo "generate_orion.php -b <build_id> [-t <train_id>]\n";
 	echo "  -b <build_id>: The Build ID for this build\n";
-	echo "  -t <train_id>: Optional: train to build (luna, kepler, juno)";
+	echo "  -t <train_id>: Optional: train to build (luna, kepler)";
 	echo "\n";
 }