diff --git a/Dockerfile b/Dockerfile
index 5b317cd003..418e8e812d 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -36,7 +36,11 @@ RUN apt-get update \
         xpdf \
     && update-locale "LANG=fr_FR.UTF-8 UTF-8" \
     && dpkg-reconfigure --frontend noninteractive locales \
-    && docker-php-ext-configure gd --with-freetype-dir=/usr/include/ --with-jpeg-dir=/usr/include/ \
+    && apt-get clean \
+    && rm -rf /var/lib/apt/lists/*
+
+RUN docker-php-ext-configure gd --with-freetype-dir=/usr/include/ --with-jpeg-dir=/usr/include/ \
+    && docker-php-source extract \
     && docker-php-ext-install -j$(nproc) gd \
     && docker-php-ext-install zip exif iconv mbstring pcntl sockets xsl intl pdo_mysql gettext bcmath mcrypt \
     && pecl install redis amqp-1.9.3 zmq-beta imagick-beta \
@@ -126,6 +130,12 @@ RUN mkdir -p /var/alchemy/Phraseanet/logs \
 
 FROM phraseanet-system as phraseanet-fpm
 
+RUN docker-php-source extract \
+    && pecl install xdebug-2.9.0 \
+    && docker-php-ext-enable xdebug \
+    #&& pecl clear-cache \
+    && docker-php-source delete
+
 COPY --from=builder --chown=app /var/alchemy /var/alchemy/Phraseanet
 ADD ./docker/phraseanet/ /
 WORKDIR /var/alchemy/Phraseanet
diff --git a/docker/phraseanet/boot.sh b/docker/phraseanet/boot.sh
index 444b63a64c..578da3a8da 100755
--- a/docker/phraseanet/boot.sh
+++ b/docker/phraseanet/boot.sh
@@ -14,4 +14,4 @@ else
     runuser app -c '/auto-install.sh'
 fi
 
-php-fpm
+php-fpm -F
diff --git a/docker/phraseanet/phraseanet-entrypoint.sh b/docker/phraseanet/phraseanet-entrypoint.sh
index 225b56a672..3040718c11 100755
--- a/docker/phraseanet/phraseanet-entrypoint.sh
+++ b/docker/phraseanet/phraseanet-entrypoint.sh
@@ -4,5 +4,16 @@ set -e
 
 envsubst < /php.ini.sample > /usr/local/etc/php/php.ini
 envsubst < /php-fpm.conf.sample > /usr/local/etc/php-fpm.conf
+echo "XDEBUG=$XDEBUG"
+if [ $XDEBUG = "ON" ]; then
+  echo "XDEBUG IS ENABLED. YOU MAY KEEP THIS FEATURE DISABLED IN PRODUCTION."
+  echo "xdebug.remote_enable=1" >> /usr/local/etc/php/conf.d/docker-php-ext-xdebug.ini
+  echo "xdebug.remote_autostart=1" >> /usr/local/etc/php/conf.d/docker-php-ext-xdebug.ini
+  echo "xdebug.remote_host=$XDEBUG_SERVER" >> /usr/local/etc/php/conf.d/docker-php-ext-xdebug.ini
+  echo "xdebug.remote_port=$XDEBUG_REMOTE_PORT" >> /usr/local/etc/php/conf.d/docker-php-ext-xdebug.ini
+  echo "xdebug.remote_handler=dbgp" >> /usr/local/etc/php/conf.d/docker-php-ext-xdebug.ini
+  echo "xdebug.remote_connect_back=0" >> /usr/local/etc/php/conf.d/docker-php-ext-xdebug.ini
+  #echo "xdebug.idekey=11896" >> /usr/local/etc/php/conf.d/docker-php-ext-xdebug.ini
+fi
 
 bash -e docker-php-entrypoint $@