diff --git a/configure.in b/configure.in
index 3e1e274080fa202a83e5c5e408942ced1d9baea9..64587b05d5c7f0035c64b35ce12d58ba6ee37f0e 100755
--- a/configure.in
+++ b/configure.in
@@ -526,14 +526,28 @@ if test "$enable_windows" = "yes"; then
 		  os/imagezip/ntfs/libntfs/GNUmakefile \
 		  os/imagezip/fat/GNUmakefile"
 	optional_subdirs="$optional_subdirs";
-	EXE_SUFFIX=".exe";
 	WINSUPPORT=1;
 else
 	winfiles="";
-	EXE_SUFFIX="";
 	WINSUPPORT=0;
 fi
 AC_SUBST(WINSUPPORT)
+
+#
+# Enable Windows Client support.
+# Right now this means we are building the client software under CygWin.
+# You should also turn on --enable-windows.
+# Off by default.
+# 
+AC_ARG_ENABLE(windowsclient,
+[  --enable-windowsclient      Enable Windows XP client support (requires third-party software)])
+
+if test "$enable_windowsclient" = "yes"; then
+	# This is needed in strip and install actions.
+	EXE_SUFFIX=".exe";
+else
+	EXE_SUFFIX="";
+fi
 AC_SUBST(EXE_SUFFIX)
 
 #