diff --git a/README.md b/README.md
index c45f4aee620f16efa535499bc5ff74bddd218ab6..c20ce081f28b66c34974839b41dfb9486937e5cf 100644
--- a/README.md
+++ b/README.md
@@ -106,11 +106,14 @@ MySQL:
  * Execute bash in the mysql container: `docker exec -it <containerid> bash -l`
  * Once inside the mysql container execute the `mysql` command: `mysql --user=xwiki --password=xwiki`
 
-# Future
+# Support
 
-* Setup xinit
-* Configure libreoffice
-* Solr as external service
+* If you wish to raise an issue or an idea of improvement use [XWiki Docker JIRA project](http://jira.xwiki.org/browse/XDOCKER)
+* If you have questions, use the [XWiki Users Mailing List/Forum](http://dev.xwiki.org/xwiki/bin/view/Community/MailingLists) or use the [XWiki IRC channel](http://dev.xwiki.org/xwiki/bin/view/Community/IRC)
+
+# Contribute
+
+* If you wish to help out on the code, please send Pull Requests on [XWiki Docker GitHub project](https://github.com/xwiki-contrib/docker-xwiki)
 
 # Credits
 
diff --git a/xwiki-mysql-tomcat/.dockerignore b/xwiki-mysql-tomcat/.dockerignore
new file mode 100644
index 0000000000000000000000000000000000000000..f4df6517afd1b61a0e3e514529365396f844bddb
--- /dev/null
+++ b/xwiki-mysql-tomcat/.dockerignore
@@ -0,0 +1 @@
+docker-compose-using.yml
diff --git a/xwiki-mysql-tomcat/Dockerfile b/xwiki-mysql-tomcat/Dockerfile
index d40cff5934e28e616e909d19f7296e3ef89bf051..5ee54dfbca477c137b74153e802f602b15a15613 100644
--- a/xwiki-mysql-tomcat/Dockerfile
+++ b/xwiki-mysql-tomcat/Dockerfile
@@ -32,7 +32,14 @@ ENV XWIKI_VERSION=8.4.4 \
 RUN echo "deb http://http.debian.net/debian jessie-backports main" > /etc/apt/sources.list.d/backports.list && \
   apt-get update && \
   apt-get -y upgrade && \
-  apt-get --no-install-recommends -y --force-yes install sudo nano unzip curl openjdk-8-jdk tomcat8 libreoffice && \
+  apt-get --no-install-recommends -y --force-yes install \
+    curl \
+    libreoffice \
+    nano \
+    openjdk-8-jdk \
+    sudo \
+    tomcat8 \
+    unzip && \
   rm -rf /var/lib/apt/lists/*
 
 # Install XWiki as the ROOT webapp context in Tomcat
@@ -97,4 +104,5 @@ ENTRYPOINT ["start_xwiki.sh"]
 
 # When no options are passed on the "docker run" command line we display a message explaining what environment
 # variables can be overridden.
+# Note: This is not implemented yet and FTM --info does nothing.
 CMD ["--info"]
diff --git a/xwiki-mysql-tomcat/xwiki/start_xwiki.sh b/xwiki-mysql-tomcat/xwiki/start_xwiki.sh
index 38dc633edd3f1a9f5cadb1b4b08d7b51e61f05a3..cff36a2c3bbfc96dfe8500d09788a66c09c91f34 100755
--- a/xwiki-mysql-tomcat/xwiki/start_xwiki.sh
+++ b/xwiki-mysql-tomcat/xwiki/start_xwiki.sh
@@ -20,6 +20,8 @@ function configure() {
 
   echo '  Setting permanent directory...'
   xwiki-set-properties 'environment.permanentDirectory' '/var/lib/xwiki'
+  echo '  Configure libreoffice...'
+  xwiki-set-properties 'openoffice.autoStart' 'true'
 }
 
 if [[ ! -f /var/lib/tomcat/.first_start_completed ]]; then