diff --git a/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Collector/memory.html.twig b/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Collector/memory.html.twig
index 7567eb935f28e..50989346f7685 100644
--- a/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Collector/memory.html.twig
+++ b/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Collector/memory.html.twig
@@ -10,7 +10,7 @@
     {% set text %}
         <div class="sf-toolbar-info-piece">
             <b>Memory usage</b>
-            <span>{{ '%.1f'|format(collector.memory / 1024 / 1024) }} MB</span>
+            <span>{{ '%.1f'|format(collector.memory / 1024 / 1024) }} / {{ collector.memoryLimit == -1 ? '&infin;' : collector.memoryLimit }} MB</span>
         </div>
     {% endset %}
     {% include '@WebProfiler/Profiler/toolbar_item.html.twig' with { 'link': false } %}
diff --git a/src/Symfony/Component/HttpKernel/DataCollector/MemoryDataCollector.php b/src/Symfony/Component/HttpKernel/DataCollector/MemoryDataCollector.php
index 649c88d7643d8..a669dd00152cb 100644
--- a/src/Symfony/Component/HttpKernel/DataCollector/MemoryDataCollector.php
+++ b/src/Symfony/Component/HttpKernel/DataCollector/MemoryDataCollector.php
@@ -23,7 +23,10 @@ class MemoryDataCollector extends DataCollector
 {
     public function __construct()
     {
-        $this->data = array('memory' => 0);
+        $this->data = array(
+            'memory' => 0,
+            'memory_limit' => rtrim(ini_get('memory_limit'), 'M')
+        );
     }
 
     /**
@@ -44,6 +47,16 @@ public function getMemory()
         return $this->data['memory'];
     }
 
+    /**
+     * Gets the PHP memory limit.
+     *
+     * @return integer The memory limit
+     */
+    public function getMemoryLimit()
+    {
+        return $this->data['memory_limit'];
+    }
+
     /**
      * Updates the memory usage data.
      */