diff --git a/Controller/Controller.php b/Controller/Controller.php
index c4ad6953..aea785f0 100644
--- a/Controller/Controller.php
+++ b/Controller/Controller.php
@@ -108,7 +108,7 @@ public function indexAction(Request $request, $_format)
                 throw new HttpException(400, 'Invalid JSONP callback value');
             }
 
-            $content = $callback.'('.$content.');';
+            $content = '/**/' . $callback . '(' . $content . ');';
         }
 
         $response = new Response($content, 200, array('Content-Type' => $request->getMimeType($_format)));
diff --git a/Tests/Controller/ControllerTest.php b/Tests/Controller/ControllerTest.php
index c0c46066..98af6438 100644
--- a/Tests/Controller/ControllerTest.php
+++ b/Tests/Controller/ControllerTest.php
@@ -94,7 +94,7 @@ public function testGenerateWithCallback($callback)
         $response   = $controller->indexAction($this->getRequest('/', 'GET', array('callback' => $callback)), 'json');
 
         $this->assertEquals(
-            sprintf('%s({"base_url":"","routes":[],"prefix":"","host":"","scheme":""});', $callback),
+            sprintf('/**/%s({"base_url":"","routes":[],"prefix":"","host":"","scheme":""});', $callback),
             $response->getContent()
         );
     }