diff --git a/includes/definitions.inc.php b/includes/definitions.inc.php
index 0fc20c740d..b818cf2666 100644
--- a/includes/definitions.inc.php
+++ b/includes/definitions.inc.php
@@ -1276,6 +1276,14 @@ $config['os'][$os]['icon']             = 'perle';
 $config['os'][$os]['over'][0]['graph'] = 'device_bits';
 $config['os'][$os]['over'][0]['text']  = 'Traffic';
 
+// MACOSX
+$os = 'macosx';
+$config['os'][$os]['text']             = 'Apple OSX';
+$config['os'][$os]['type']             = 'server';
+$config['os'][$os]['icon']             = 'generic';
+$config['os'][$os]['over'][0]['graph'] = 'device_bits';
+$config['os'][$os]['over'][0]['text']  = 'Traffic';
+
 // Graph Types
 require_once $config['install_dir'].'/includes/load_db_graph_types.inc.php';
 
diff --git a/includes/discovery/os/macosx.inc.php b/includes/discovery/os/macosx.inc.php
new file mode 100644
index 0000000000..e2cf9a5343
--- /dev/null
+++ b/includes/discovery/os/macosx.inc.php
@@ -0,0 +1,16 @@
+<?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.8072.3.2.16') !== false) {
+        $os = 'macosx';
+    }
+}