diff --git a/app/devices/resources/classes/device.php b/app/devices/resources/classes/device.php
index 89af6875a5..b7998c7674 100644
--- a/app/devices/resources/classes/device.php
+++ b/app/devices/resources/classes/device.php
@@ -119,6 +119,24 @@ include "root.php";
 				case "0C383E":
 					$device_vendor = "fanvil";
 					break;
+				case "7c2f80":
+					$device_vendor = "gigaset";
+					break;
+				case "14b370":
+					$device_vendor = "gigaset";
+					break;
+				case "002104":
+					$device_vendor = "gigaset";
+					break;
+				case "bcc342":
+					$device_vendor = "panasonic";
+					break;
+				case "080023":
+					$device_vendor = "panasonic";
+					break;
+				case "0080f0":
+					$device_vendor = "panasonic";
+					break;
 				default:
 					$device_vendor = "";
 				}
@@ -166,6 +184,9 @@ include "root.php";
 					if (preg_match('/^.*?panasonic.*$/i', $agent)) {
 						return "panasonic";
 					}
+					if (preg_replace('/^.*?(N510).*$/i', '$1', $agent) == "n510") {
+						return "gigaset";
+					}
 					if (preg_match('/^.*?htek.*$/i', $agent)) {
 						return "htek";
 					}
diff --git a/app/provision/resources/classes/provision.php b/app/provision/resources/classes/provision.php
index a09e5c330b..68a4c10c0a 100644
--- a/app/provision/resources/classes/provision.php
+++ b/app/provision/resources/classes/provision.php
@@ -170,6 +170,9 @@ include "root.php";
 			case "yealink":
 				$mac = strtolower($mac);
 				break;
+			case "gigaset":
+				$mac = strtoupper($mac);
+				break;
 			default:
 				$mac = strtolower($mac);
 			}
@@ -1192,9 +1195,17 @@ include "root.php";
 
 				//set the mac address in the correct format
 					$mac = $this->format_mac($mac, $device_vendor);
+				
+				// set date/time for versioning provisioning templates
+					if (strlen($_SESSION['provision']['version_format']['text']) > 0) {
+						$time = date($_SESSION['provision']['version_format']['text']);
+					} else {
+						$time = date("dmyHi");
+					}
 
 				//replace the variables in the template in the future loop through all the line numbers to do a replace for each possible line number
 					$view->assign("mac" , $mac);
+					$view->assign("time" , $time);
 					$view->assign("label", $device_label);
 					$view->assign("device_label", $device_label);
 					$view->assign("firmware_version", $device_firmware_version);