diff --git a/ordernumber_helper.php b/ordernumber_helper.php
index ecb977504026e623ad8567459619d00024f3e9e7..0d6f49ad889a2d23af17a6d5f1fff1b1d9d65918 100644
--- a/ordernumber_helper.php
+++ b/ordernumber_helper.php
@@ -226,18 +226,33 @@ class OrdernumberHelper {
 		}
 		return self::randomString ($alphabet, $len);
 	}
+	
+	public function getDateTime($utime) {
+		$time = new DateTime();
+		$time->setTimestamp($utime);
+		return $time;
+	}
 
 	public function setupDateTimeReplacements (&$reps, $details, $nrtype) {
 		$utime = microtime(true);
-		$reps["[year]"] = date ("Y", $utime);
-		$reps["[year2]"] = date ("y", $utime);
-		$reps["[month]"] = date("m", $utime);
-		$reps["[day]"] = date("d", $utime);
-		$reps["[hour]"] = date("H", $utime);
-		$reps["[hour12]"] = date("h", $utime);
-		$reps["[ampm]"] = date("a", $utime);
-		$reps["[minute]"] = date("i", $utime);
-		$reps["[second]"] = date("s", $utime);
+		$time = $this->getDateTime($utime);
+		$reps["[year]"] = $time->format ("Y");
+		$reps["[year2]"] = $time->format ("y");
+		$reps["[month]"] = $time->format("m");
+		$reps["[monthname]"] = $time->format("F");
+		$reps["[monthname3]"] = $time->format("M");
+		$reps["[week]"] = $time->format("W");
+		$reps["[weeknumberyear]"] = $time->format("o");
+		$reps["[day]"] = $time->format("d");
+		$reps["[dayofyear]"] = $time->format("z")+1;
+		$reps["[weekday]"] = $time->format("N");
+		$reps["[weekdayname3]"] = $time->format("D");
+		$reps["[weekdayname]"] = $time->format("l");
+		$reps["[hour]"] = $time->format("H");
+		$reps["[hour12]"] = $time->format("h");
+		$reps["[ampm]"] = $time->format("a");
+		$reps["[minute]"] = $time->format("i");
+		$reps["[second]"] = $time->format("s");
 		$milliseconds = (int)(1000*($utime - (int)$utime));
 		$millisecondsstring = sprintf('%03d', $milliseconds);
 		$reps["[decisecond]"] = $millisecondsstring[0];