diff --git a/Dockerfile b/Dockerfile
deleted file mode 100644
index 64ec6704..00000000
--- a/Dockerfile
+++ /dev/null
@@ -1,25 +0,0 @@
-
-
-# Install the Webmail from source
-
-
-# Install the Web admin panel
-COPY admin /admin
-RUN pip install -r /admin/requirements.txt
-
-# Configure the webmail
-RUN cd /webmail \
- && rm -rf CHANGELOG INSTALL LICENSE README.md UPDGRADING composer.json-dist temp logs \
- && ln -s /data/logs/webmail logs \
- && ln -s /data/webmail/temp temp \
- && ln -s /etc/roundcube.inc.php config/config.inc.php
-
-# Load the configuration
-COPY config /etc/
-
-# Copy the entrypoint
-COPY start.sh /start.sh
-
-# Explicitely specify the configuration file to avoid problems when
-# the default configuration path changes.
-CMD "/start.sh"
diff --git a/README.md b/README.md
index 77bfd4b0..8ef9936f 100644
--- a/README.md
+++ b/README.md
@@ -15,6 +15,19 @@ same level of functionality and still be able to host a complete mail server
 at little cost while running only FOSS, applying the KISS principle and being
 able to fine-tune some details if needed.
 
+General architecture
+====================
+
+The mail infrastructure is based on a standard MTA-LDA pattern :
+
+ * Postfix for incoming and outgoing emails ;
+ * Amavis as a filtering interface before delivery (with SpamaAssassin and ClamAV) ;
+ * Dovecot as a delivery agent and reading (IMAP) server ;
+ * Roundcube (or any Webmail) as a user-friendly Web client ;
+ * Freeposte (Flask application) as an administration interface.
+
+![Architecture](doc/archi.png)
+
 How-to run your mail server
 ===========================
 
@@ -45,18 +58,3 @@ Finally, you can run your mail server:
 ```
 docker-compose up -d
 ```
-
-General architecture
-====================
-
-The mail infrastructure is based on a standard MTA-LDA :
-
- * Postfix with an SQLite database for transport ;
- * Dovecot with an SQLite database for delivery and access ;
- * Spamassassin for spam filtering ;
- * ClamAV for malware filtering.
-
-Additional Web UI :
-
- * Roundcube Webmail (can easily be replaced) ;
- * Administration UI based on Flask.
diff --git a/doc/archi.png b/doc/archi.png
new file mode 100644
index 00000000..272dc7a2
Binary files /dev/null and b/doc/archi.png differ