diff --git a/doc/General/Changelog.md b/doc/General/Changelog.md
index f4d0831179..1ff997b3b3 100644
--- a/doc/General/Changelog.md
+++ b/doc/General/Changelog.md
@@ -32,6 +32,7 @@
     - Added support for saving notes for devices (PR1927)
   - Added detection for:
     - FortiOS (PR1815)
+    - HP MSM (PR1953)
   - Discovery / Poller:
     - Added Proxmox support (PR1789)
   - Documentation:
diff --git a/includes/definitions.inc.php b/includes/definitions.inc.php
index 762034ea93..5ea1b0d445 100644
--- a/includes/definitions.inc.php
+++ b/includes/definitions.inc.php
@@ -1290,6 +1290,14 @@ $config['os'][$os]['icon']             = 'generic';
 $config['os'][$os]['over'][0]['graph'] = 'device_bits';
 $config['os'][$os]['over'][0]['text']  = 'Traffic';
 
+// HP MSM 
+$os = 'hpmsm';
+$config['os'][$os]['text']             = 'HP MSM';
+$config['os'][$os]['type']             = 'wireless';
+$config['os'][$os]['icon']             = 'hp';
+$config['os'][$os]['over'][0]['graph'] = 'device_bits';
+$config['os'][$os]['over'][0]['text']  = 'Traffic';
+
 // Appliances
 $os = 'fortios';
 $config['os'][$os]['text']             = 'FortiOS';
diff --git a/includes/discovery/os/hpmsm.inc.php b/includes/discovery/os/hpmsm.inc.php
new file mode 100644
index 0000000000..f586c1bc8f
--- /dev/null
+++ b/includes/discovery/os/hpmsm.inc.php
@@ -0,0 +1,20 @@
+<?php
+/*
+ * LibreNMS
+ *
+ * Copyright (c) 2015 Søren Friis Rosiak <sorenrosiak@gmail.com>
+ * This program is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the
+ * Free Software Foundation, either version 3 of the License, or (at your
+ * option) any later version.  Please see LICENSE.txt at the top level of
+ * the source code distribution for details.
+ */
+if (!$os) {
+    if (strpos($sysObjectId, '1.3.6.1.4.1.8744.1') !== false) {
+        $split_oid = explode('.',$sysObjectId);
+        $model_oid = $split_oid[count($split_oid)-1];
+        if ($model_oid >= 40 && $model_oid < 60 || $model_oid = 67) {
+            $os = 'hpmsm';
+        }
+    }
+}