diff --git a/src/BeSimple/SoapBundle/Controller/SoapWebServiceController.php b/src/BeSimple/SoapBundle/Controller/SoapWebServiceController.php
index 952ad39..d65e434 100644
--- a/src/BeSimple/SoapBundle/Controller/SoapWebServiceController.php
+++ b/src/BeSimple/SoapBundle/Controller/SoapWebServiceController.php
@@ -92,10 +92,8 @@ class SoapWebServiceController extends ContainerAware
         ));
 
         $query = $this->container->get('request')->query;
-        if ($query->has('wsdl') || $query->has('WSDL')) {
-            $response->headers->set('Content-Type', 'application/wsdl+xml');
-        } else {
-            $response->headers->set('Content-Type', 'text/xml');
+        if (!$query->has('wsdl') && !$query->has('WSDL')) {
+            $this->container->get('request')->setRequestFormat('xml');
         }
 
         return $response;
diff --git a/src/BeSimple/SoapBundle/DependencyInjection/BeSimpleSoapExtension.php b/src/BeSimple/SoapBundle/DependencyInjection/BeSimpleSoapExtension.php
index 941cbf0..3db1218 100644
--- a/src/BeSimple/SoapBundle/DependencyInjection/BeSimpleSoapExtension.php
+++ b/src/BeSimple/SoapBundle/DependencyInjection/BeSimpleSoapExtension.php
@@ -40,6 +40,8 @@ class BeSimpleSoapExtension extends Extension
     {
         $loader = new XmlFileLoader($container, new FileLocator(__DIR__.'/../Resources/config'));
 
+        $loader->load('request.xml');
+
         $loader->load('loaders.xml');
         $loader->load('converters.xml');
         $loader->load('webservice.xml');
diff --git a/src/BeSimple/SoapBundle/EventListener/RequestFormatListener.php b/src/BeSimple/SoapBundle/EventListener/RequestFormatListener.php
new file mode 100644
index 0000000..3fbabd6
--- /dev/null
+++ b/src/BeSimple/SoapBundle/EventListener/RequestFormatListener.php
@@ -0,0 +1,15 @@
+<?php
+
+namespace BeSimple\SoapBundle\EventListener;
+
+use Symfony\Component\HttpKernel\HttpKernelInterface;
+use Symfony\Component\HttpKernel\Event\GetResponseEvent;
+
+class RequestFormatListener
+{
+    public function onKernelRequest(GetResponseEvent $event)
+    {
+        $event->getRequest()->setFormat('wsdl', 'application/wsdl+xml');
+        $event->getRequest()->setFormat('soap', 'application/soap+xml');
+    }
+}
diff --git a/src/BeSimple/SoapBundle/Resources/config/request.xml b/src/BeSimple/SoapBundle/Resources/config/request.xml
new file mode 100644
index 0000000..0fb4690
--- /dev/null
+++ b/src/BeSimple/SoapBundle/Resources/config/request.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<container xmlns="http://symfony.com/schema/dic/services"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:schemaLocation="http://symfony.com/schema/dic/services http://symfony.com/schema/dic/services/services-1.0.xsd">
+
+    <parameters>
+        <parameter key="besimple.soap.request_format.listener.class">BeSimple\SoapBundle\EventListener\RequestFormatListener</parameter>
+    </parameters>
+
+    <services>
+        <service id="besimple.soap.request_format.listener" class="%besimple.soap.request_format.listener.class%">
+            <tag name="kernel.event_listener" event="kernel.request" method="onKernelRequest" />
+        </service>
+    </services>
+
+</container>
diff --git a/src/BeSimple/SoapBundle/Resources/config/routing/webservicecontroller.xml b/src/BeSimple/SoapBundle/Resources/config/routing/webservicecontroller.xml
index 98e80e4..b2ce4c0 100644
--- a/src/BeSimple/SoapBundle/Resources/config/routing/webservicecontroller.xml
+++ b/src/BeSimple/SoapBundle/Resources/config/routing/webservicecontroller.xml
@@ -6,13 +6,13 @@
 
     <route id="_webservice_call" pattern="/{webservice}">
         <default key="_controller">BeSimpleSoapBundle:SoapWebService:Call</default>
-        <default key="_format">xml</default>
+        <default key="_format">soap</default>
         <requirement key="_method">POST</requirement>
     </route>
 
     <route id="_webservice_definition" pattern="/{webservice}">
         <default key="_controller">BeSimpleSoapBundle:SoapWebService:Definition</default>
-        <default key="_format">xml</default>
+        <default key="_format">wsdl</default>
         <requirement key="_method">GET</requirement>
     </route>
 </routes>