diff --git a/CHANGELOG.md b/CHANGELOG.md
index 90507f8..eb3d8e3 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -8,7 +8,7 @@
 * Gnome preseed is now only available with UEFI (see #20).
 
 ### Fix
-* Leave standard task in peace to be able to have a X session for user's nodes… (see #17).
+* Remove tasksel only if no X session was installed (see #17).
 * Update doc about Debian distribution name and remove useless entries (oldStable).
 * No longer define zsh as default shell for root.
 * Installation of aptitude, puppet, tmux and zsh move to latecommand script (post.sh).
diff --git a/scripts/latecommand.tar.gz b/scripts/latecommand.tar.gz
index 90005d9..73ac4d3 100644
Binary files a/scripts/latecommand.tar.gz and b/scripts/latecommand.tar.gz differ
diff --git a/scripts/latecommand/post.sh b/scripts/latecommand/post.sh
index 80c894c..6ec54da 100755
--- a/scripts/latecommand/post.sh
+++ b/scripts/latecommand/post.sh
@@ -57,6 +57,14 @@ aptitude -y install openssh-server openssh-sftp-server
 # Ansible dependencies
 aptitude -y install python-apt
 
+### Tasksel {{{
+# If tasksel and tasksel-data are the only task* relative packages
+if [ "$(dpkg -l | grep task | wc -l)" -eq "2" ]; then
+	aptitude -y remove tasksel tasksel-data
+fi
+
+### }}}
+
 ## }}}
 
 ### Rsyslog {{{