diff --git a/checks/ospf_neighbor b/checks/ospf_neighbor
index 3b46af216991fce41b1e9f8e20b745bd1605bce7..9c63c2774394e7036875312bf7c30ea852b19f88 100644
--- a/checks/ospf_neighbor
+++ b/checks/ospf_neighbor
@@ -175,7 +175,7 @@ def check_ospf_neighbor(item, params, parsed):
     }
 
     alias = None
-    notFoundState = 3
+    notFoundState = 2
 
     for neighbour, neighbourAlias, neighbourNotFoundState in params.get('peer_list', []):
         if item == neighbour:
@@ -198,16 +198,16 @@ def check_ospf_neighbor(item, params, parsed):
         perfdata.append(['ospf_events', neighbor['events']])
 
         for text, value in [
-            ('\nNeighbor options', neighbor['options']),
-            ('\nNeighbor priority', neighbor['prio']),
-            ('\nNeighbor permanence', neighbor['permanence']),
-            ('\nNeighbor hello suppressed', neighbor['hellosup']),
-            ('\nNeighbor helper status', neighbor['helperstatus']),
-            ('\nNeighbor helper age', neighbor['helperage']),
-            ('\nNeighbor helper exit reason', neighbor['helperexitreason']),
+            ('options', neighbor['options']),
+            ('priority', neighbor['prio']),
+            ('permanence', neighbor['permanence']),
+            ('hello suppressed', neighbor['hellosup']),
+            ('helper status', neighbor['helperstatus']),
+            ('helper age', neighbor['helperage']),
+            ('helper exit reason', neighbor['helperexitreason']),
         ]:
             if value != '':
-                longoutput += '%s: %s' % (text, value)
+                longoutput += '\nNeighbor %s: %s' % (text, value)
 
         yield 0, infotext + longoutput, perfdata
     else:
diff --git a/ospf_neighbor.mkp b/ospf_neighbor.mkp
index 0c2f68a17c8b26b0a7e545dba95e0c5ab136a96e..6c4dc70afda94f7814e4fc23f3cc38a047992696 100644
Binary files a/ospf_neighbor.mkp and b/ospf_neighbor.mkp differ