diff --git a/Dockerfile b/Dockerfile
index e1d4b6e77..4db07cf0b 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -7,9 +7,17 @@ RUN apt-get -qq update
 RUN apt-get install -qq apache2-mpm-event
 
 RUN sed -e 's|/var/www|&/public_html|' -e 's/\(Log \+\)[^ ]\+/\1"|cat"/' -i /etc/apache2/sites-available/default 
+RUN a2ensite default
+
+RUN sed -e 's|/var/www|&/public_html|' -e 's/\(Log \+\)[^ ]\+/\1"|cat"/' -i /etc/apache2/sites-available/default-ssl
+RUN sed -e '/SSLCertificateKeyFile/s|ssl-cert-snakeoil.key|ssl-cert.key|' -e '/SSLCertificateFile/s|ssl-cert-snakeoil.pem|ssl-cert.pem|' -i /etc/apache2/sites-available/default-ssl
+RUN ln -snf ssl-cert-snakeoil.pem /etc/ssl/certs/ssl-cert.pem
+RUN ln -snf ssl-cert-snakeoil.key /etc/ssl/private/ssl-cert.key
+RUN a2ensite default-ssl
 
 RUN a2enmod expires
 RUN a2enmod headers
+RUN a2enmod ssl
 
 RUN apt-get install -qq php5 php-pear php5-mysql php5-pgsql php5-sqlite
 RUN pear install mail_mime mail_mimedecode net_smtp2-beta net_idna2-beta auth_sasl2-beta net_sieve crypt_gpg