diff --git a/includes/polling/os/hpmsm.inc.php b/includes/polling/os/hpmsm.inc.php
new file mode 100644
index 0000000000..9d41c038a2
--- /dev/null
+++ b/includes/polling/os/hpmsm.inc.php
@@ -0,0 +1,17 @@
+<?php
+/*
+ * LibreNMS HP MSM OS information module
+ *
+ * Copyright (c) 2016 Mike Rostermund <mike@kollegienet.dk>
+ * 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.
+ */
+
+$sysdescr = snmp_get($device, 'SNMPv2-MIB::sysDescr.0', '-Ovq');
+preg_match_all('/^(MSM\d{3})|Serial number ([\S]+)|Firmware version (\d+\.\d+\.\d+\.\d+-\d+)/', $sysdescr, $matches);
+$hardware = $matches[1][0];
+$serial = $matches[2][1];
+$version = $matches[3][2];