diff --git a/includes/definitions/celvin.yaml b/includes/definitions/celvin.yaml
new file mode 100644
index 0000000000..e2d96becf7
--- /dev/null
+++ b/includes/definitions/celvin.yaml
@@ -0,0 +1,11 @@
+os: celvin
+text: Fujitsu NAS
+type: storage
+icon: fujitsu
+over:
+    - { graph: device_bits, text: 'Device Traffic' }
+    - { graph: device_processor, text: 'CPU Usage' }
+    - { graph: device_mempool, text: 'Memory Usage' }
+discovery:
+    - sysObjectId:
+        - .1.3.6.1.6.3.11.2.3.1.1
diff --git a/tests/OSDiscoveryTest.php b/tests/OSDiscoveryTest.php
index d0be5fcaec..2a403d28c2 100644
--- a/tests/OSDiscoveryTest.php
+++ b/tests/OSDiscoveryTest.php
@@ -389,6 +389,11 @@ class DiscoveryTest extends \PHPUnit_Framework_TestCase
         $this->checkOS('ceraos');
     }
 
+    public function testCelvin()
+    {
+        $this->checkOS('celvin');
+    }
+
     public function testCimc()
     {
         $this->checkOS('cimc');
diff --git a/tests/snmpsim/celvin.snmprec b/tests/snmpsim/celvin.snmprec
new file mode 100644
index 0000000000..d04bfbcc5f
--- /dev/null
+++ b/tests/snmpsim/celvin.snmprec
@@ -0,0 +1 @@
+1.3.6.1.2.1.1.2.0|6|1.3.6.1.6.3.11.2.3.1.1
\ No newline at end of file