diff --git a/AUTHORS.md b/AUTHORS.md
index ad60a7f79..313bbfccd 100644
--- a/AUTHORS.md
+++ b/AUTHORS.md
@@ -20,6 +20,7 @@ Contributors to LibreNMS:
 - Joubert RedRat <me+github@redrat.com.br> (joubertredrat)
 - Len Lin <Ultra2D@users.noreply.github.com> (Ultra2D)
 - Christopher Freas <code@packetbusters.net> (nwautomator)
+- Stuart Henderson <stu@spacehopper.org> (sthen)
 
 [1]: http://observium.org/ "Observium web site"
 
diff --git a/includes/discovery/os/openbsd.inc.php b/includes/discovery/os/openbsd.inc.php
index 52bbf7177..22e97e5cb 100755
--- a/includes/discovery/os/openbsd.inc.php
+++ b/includes/discovery/os/openbsd.inc.php
@@ -2,7 +2,8 @@
 
 if (!$os)
 {
-  if (preg_match("/OpenBSD/", $sysDescr)) { $os = "openbsd"; }
+  if (strstr($sysObjectId, ".1.3.6.1.4.1.30155.23.1")) { $os = "openbsd"; } # snmpd
+  if (preg_match("/OpenBSD/", $sysDescr)) { $os = "openbsd"; } # Net-SNMP
 }
 
 ?>