diff --git a/scripts/latecommand.tar.gz b/scripts/latecommand.tar.gz
index a47d62e..2f30054 100644
Binary files a/scripts/latecommand.tar.gz and b/scripts/latecommand.tar.gz differ
diff --git a/scripts/latecommand/post.stretch.sh b/scripts/latecommand/post.stretch.sh
index e81e85a..ca49ad3 100755
--- a/scripts/latecommand/post.stretch.sh
+++ b/scripts/latecommand/post.stretch.sh
@@ -36,20 +36,19 @@ aptitude -y install dbus libpam-systemd
 aptitude -y remove nfs-common rpcbind
 
 ### Documentation {{{
-# Remove task-french
-if [ "$(dpkg -l task-french)" ]; then
-	# Move default wordlist to american before remove all packages
-	select-default-wordlist --set-default=american
-	aptitude -y remove task-french
-
-	# Reinstall useful french doc and move back to french dict
-	aptitude -y install aspell-fr doc-debian-fr doc-linux-fr-text ifrench-gut manpages-fr manpages-fr-extra wfrench
-	select-default-wordlist --set-default=".*(F|f)rench.*"
-fi
-
-# Remove task-english
-if [ "$(dpkg -l task-english)" ]; then
-	aptitude -y remove task-english
+# If no X display is expected
+if [ ! "$(dpkg -l xorg)" ]; then
+	## Remove unwanted x11 lib
+	aptitude -y remove libx11-6 libx11-data libxau6 libxcb1 libxdmcp6 libxext6 libxmuu1 xauth
+	if [ "$(dpkg -l task-english)" ]; then
+		## Remove task-english
+		aptitude -y remove task-english iamerican ibritish ienglish-common ispell util-linux-locales wamerican
+	fi
+else
+	if [ "$(dpkg -l task-english)" ]; then
+		## Remove task-english
+		aptitude -y remove task-english
+	fi
 fi
 
 # Ensure to have minimal documentation