diff --git a/html/images/os/checkpoint.png b/html/images/os/checkpoint.png
new file mode 100644
index 0000000000..938872d5a9
Binary files /dev/null and b/html/images/os/checkpoint.png differ
diff --git a/includes/definitions.inc.php b/includes/definitions.inc.php
index b92094b2fb..a24a2d10a6 100644
--- a/includes/definitions.inc.php
+++ b/includes/definitions.inc.php
@@ -128,6 +128,18 @@ $config['os'][$os]['over'][1]['text']  = 'Processor Usage';
 $config['os'][$os]['over'][2]['graph'] = 'device_mempool';
 $config['os'][$os]['over'][2]['text']  = 'Memory Usage';
 
+$os = 'gaia';
+$config['os'][$os]['text']             = 'Check Point GAiA';
+$config['os'][$os]['type']             = 'firewall';
+$config['os'][$os]['icon']             = 'checkpoint';
+$config['os'][$os]['ifname']           = 1;
+$config['os'][$os]['over'][0]['graph'] = 'device_bits';
+$config['os'][$os]['over'][0]['text']  = 'Device Traffic';
+$config['os'][$os]['over'][1]['graph'] = 'device_processor';
+$config['os'][$os]['over'][1]['text']  = 'Processor Usage';
+$config['os'][$os]['over'][2]['graph'] = 'device_mempool';
+$config['os'][$os]['over'][2]['text']  = 'Memory Usage';
+
 // Time server
 $os = 'microsemitime';
 $config['os'][$os]['text']             = 'Microsemi Timing';
diff --git a/includes/discovery/os/checkpoint.inc.php b/includes/discovery/os/checkpoint.inc.php
new file mode 100644
index 0000000000..ac64f216f2
--- /dev/null
+++ b/includes/discovery/os/checkpoint.inc.php
@@ -0,0 +1,16 @@
+<?php
+/*
+ * LibreNMS
+ *
+ * Copyright (c) 2016 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.2620.1.6.123.1.49') !== false) {
+        $os = 'gaia';
+    }
+}