diff --git a/html/images/os/f5.png b/html/images/os/f5.png
new file mode 100644
index 0000000000..35616abe32
Binary files /dev/null and b/html/images/os/f5.png differ
diff --git a/includes/definitions.inc.php b/includes/definitions.inc.php
index 825b4c3b35..37ba77450f 100644
--- a/includes/definitions.inc.php
+++ b/includes/definitions.inc.php
@@ -520,6 +520,17 @@ $config['os'][$os]['over'][0]['text'] = "Device Traffic";
$config['os'][$os]['over'][1]['graph'] = "device_processor";
$config['os'][$os]['over'][1]['text'] = "CPU Usage";
+$os = "bigip";
+$config['os'][$os]['text'] = "F5 Big IP";
+$config['os'][$os]['type'] = "loadbalancer";
+$config['os'][$os]['icon'] = "f5";
+$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'] = "CPU Usage";
+$config['os'][$os]['over'][2]['graph'] = "device_ucd_memory";
+$config['os'][$os]['over'][2]['text'] = "Memory Usage";
+
$os = "proxim";
$config['os'][$os]['text'] = "Proxim";
$config['os'][$os]['type'] = "network";
diff --git a/includes/discovery/os/f5.inc.php b/includes/discovery/os/f5.inc.php
new file mode 100644
index 0000000000..6bdf00d78f
--- /dev/null
+++ b/includes/discovery/os/f5.inc.php
@@ -0,0 +1,6 @@
+
diff --git a/includes/polling/os/f5.inc.php b/includes/polling/os/f5.inc.php
new file mode 100644
index 0000000000..54c8eaa819
--- /dev/null
+++ b/includes/polling/os/f5.inc.php
@@ -0,0 +1,4 @@
+