diff --git a/debian/changelog b/debian/changelog
index 396ce23d..cdd9ad9d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -11,6 +11,10 @@ debian-cd (3.1.6) UNRELEASED; urgency=low
   [ Otavio Salvador ]
   * Add btrfs-tools on required packages by installer. Closes: #612007.
 
+  [ Didier Raboud ]
+  * Remove win32-loader standalone flavours from the tools/ directory on
+    x86. Closes: #612224
+
  -- Raphaël Hertzog <hertzog@debian.org>  Fri, 04 Feb 2011 09:59:21 +0100
 
 debian-cd (3.1.5) unstable; urgency=high
diff --git a/tools/boot/squeeze/boot-x86 b/tools/boot/squeeze/boot-x86
index a7ea2c2c..b7720276 100644
--- a/tools/boot/squeeze/boot-x86
+++ b/tools/boot/squeeze/boot-x86
@@ -123,6 +123,8 @@ if [ "$NN" = "1" ]; then
 	   [ "$OMIT_DOC_TOOLS" != "1" ] ; then
 		echo "  Adding tools to CD1"
 		$BASEDIR/tools/add_files $CDDIR $MIRROR tools
+		# Remove the win32-loader/ subdirectory from tools, as d-i already installs setup.exe
+		rm -Rf $CDDIR/tools/win32-loader
 	fi
 fi
 
diff --git a/tools/boot/wheezy/boot-x86 b/tools/boot/wheezy/boot-x86
index a7ea2c2c..b7720276 100644
--- a/tools/boot/wheezy/boot-x86
+++ b/tools/boot/wheezy/boot-x86
@@ -123,6 +123,8 @@ if [ "$NN" = "1" ]; then
 	   [ "$OMIT_DOC_TOOLS" != "1" ] ; then
 		echo "  Adding tools to CD1"
 		$BASEDIR/tools/add_files $CDDIR $MIRROR tools
+		# Remove the win32-loader/ subdirectory from tools, as d-i already installs setup.exe
+		rm -Rf $CDDIR/tools/win32-loader
 	fi
 fi