diff --git a/CHANGES.md b/CHANGES.md
index bd69720fde..094238df35 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -22,6 +22,7 @@
 - Added pagination for projects list on the console home page.
 - Updated storage calculation to match IEC standards
 - Now using Alpine as base Docker image
+- Upgraded device detctor to version 3.12.6
 - New and consistent response format for all API object + new response examples in the docs
   - Removed user roles attribute from user object (can be fetched from /v1/teams/memberships) **
   - Removed type attribute from session object response (used only internally)
diff --git a/composer.json b/composer.json
index 3bd3fd4bfa..a72697854c 100644
--- a/composer.json
+++ b/composer.json
@@ -45,7 +45,7 @@
 
         "resque/php-resque": "1.3.6",
         "geoip2/geoip2": "2.9.0",
-        "piwik/device-detector": "3.5.1",
+        "piwik/device-detector": "3.12.6",
         "dragonmantank/cron-expression": "2.2.0",
         "domnikl/statsd": "2.0.*",
         "influxdb/influxdb-php": "1.15.*",
diff --git a/docs/lists/os.json b/docs/lists/os.json
new file mode 100644
index 0000000000..6f78847227
--- /dev/null
+++ b/docs/lists/os.json
@@ -0,0 +1,78 @@
+{
+	"AIX": "AIX",
+	"AND": "Android",
+	"AMG": "AmigaOS",
+	"ATV": "Apple TV",
+	"ARL": "Arch Linux",
+	"BTR": "BackTrack",
+	"SBA": "Bada",
+	"BEO": "BeOS",
+	"BLB": "BlackBerry OS",
+	"QNX": "BlackBerry Tablet OS",
+	"BMP": "Brew",
+	"CES": "CentOS",
+	"COS": "Chrome OS",
+	"CYN": "CyanogenMod",
+	"DEB": "Debian",
+	"DFB": "DragonFly",
+	"FED": "Fedora",
+	"FOS": "Firefox OS",
+	"BSD": "FreeBSD",
+	"GNT": "Gentoo",
+	"GTV": "Google TV",
+	"HPX": "HP-UX",
+	"HAI": "Haiku OS",
+	"IRI": "IRIX",
+	"INF": "Inferno",
+	"KNO": "Knoppix",
+	"KBT": "Kubuntu",
+	"LIN": "GNU\/Linux",
+	"LBT": "Lubuntu",
+	"VLN": "VectorLinux",
+	"MAC": "Mac",
+	"MAE": "Maemo",
+	"MDR": "Mandriva",
+	"SMG": "MeeGo",
+	"MCD": "MocorDroid",
+	"MIN": "Mint",
+	"MLD": "MildWild",
+	"MOR": "MorphOS",
+	"NBS": "NetBSD",
+	"MTK": "MTK \/ Nucleus",
+	"WII": "Nintendo",
+	"NDS": "Nintendo Mobile",
+	"OS2": "OS\/2",
+	"T64": "OSF1",
+	"OBS": "OpenBSD",
+	"PSP": "PlayStation Portable",
+	"PS3": "PlayStation",
+	"RHT": "Red Hat",
+	"ROS": "RISC OS",
+	"RZD": "RazoDroiD",
+	"SAB": "Sabayon",
+	"SSE": "SUSE",
+	"SAF": "Sailfish OS",
+	"SLW": "Slackware",
+	"SOS": "Solaris",
+	"SYL": "Syllable",
+	"SYM": "Symbian",
+	"SYS": "Symbian OS",
+	"S40": "Symbian OS Series 40",
+	"S60": "Symbian OS Series 60",
+	"SY3": "Symbian^3",
+	"TDX": "ThreadX",
+	"TIZ": "Tizen",
+	"UBT": "Ubuntu",
+	"WTV": "WebTV",
+	"WIN": "Windows",
+	"WCE": "Windows CE",
+	"WMO": "Windows Mobile",
+	"WPH": "Windows Phone",
+	"WRT": "Windows RT",
+	"XBX": "Xbox",
+	"XBT": "Xubuntu",
+	"YNS": "YunOs",
+	"IOS": "iOS",
+	"POS": "palmOS",
+	"WOS": "webOS"
+}
\ No newline at end of file