diff --git a/scripts/latecommand.tar.gz b/scripts/latecommand.tar.gz
index 5eae5de..c6ec48c 100644
Binary files a/scripts/latecommand.tar.gz and b/scripts/latecommand.tar.gz differ
diff --git a/scripts/latecommand/post.buster.sh b/scripts/latecommand/post.buster.sh
index f62750f..5b8e1c0 100755
--- a/scripts/latecommand/post.buster.sh
+++ b/scripts/latecommand/post.buster.sh
@@ -35,13 +35,19 @@ apt -y full-upgrade
 # Ensure to have some basic packages
 apt -y install aptitude tmux zsh
 
-# Remove NFS and rpcbind
-# TODO: check if useful
-#aptitude -y remove nfs-common rpcbind
-
-# Remove unwanted x11 lib if no X display is expected
+# 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
 
 ### Documentation {{{
@@ -56,11 +62,6 @@ if [ "$(dpkg -l task-french)" ]; then
 	select-default-wordlist --set-default=".*(F|f)rench.*"
 fi
 
-# Remove task-english
-if [ "$(dpkg -l task-english)" ]; then
-	aptitude -y remove task-english dictionaries-common emacsen-common iamerican ibritish ienglish-common ispell util-linux-locales wamerican
-fi
-
 # Ensure to have minimal documentation
 aptitude -y install man-db manpages