diff --git a/Makefile.am b/Makefile.am
index a6d9eb4..147c8db 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,11 +1,9 @@
-###############################################################################
-# Automake targets and declarations for libcaca
-###############################################################################
+# $Id: foo$
 
 SUBDIRS = src examples test doc
 DIST_SUBDIRS = $(SUBDIRS) autotools debian
 
-EXTRA_DIST = BUGS NOTES bootstrap caca-config.in libcaca.spec
+EXTRA_DIST = BUGS NOTES bootstrap build-win32 caca-config.in libcaca.spec
 AUTOMAKE_OPTIONS = dist-bzip2
 
 bin_SCRIPTS = caca-config
diff --git a/autotools/Makefile.am b/autotools/Makefile.am
index e69de29..547df64 100644
--- a/autotools/Makefile.am
+++ b/autotools/Makefile.am
@@ -0,0 +1 @@
+# $Id: foo$
diff --git a/build-win32 b/build-win32
new file mode 100755
index 0000000..e4dfb8c
--- /dev/null
+++ b/build-win32
@@ -0,0 +1,37 @@
+#! /bin/sh
+
+##  Win32 cross-compilation for libcaca -- Sam Hocevar <sam@zoy.org>
+##  $Id$
+
+set -x
+set -e
+
+# Clean up our working directory
+DIRNAME="libcaca-win32-`sed -ne '/^VERSION/s/[^0-9]*//p' Makefile`"
+DESTDIR="`pwd`/${DIRNAME}"
+rm -Rf "${DIRNAME}"
+rm -f "${DIRNAME}.zip"
+mkdir "${DIRNAME}"
+
+# Build for win32
+./configure --host=i586-mingw32msvc --prefix=/ --bindir=/ --libdir=/ --disable-imlib2
+make pkglibdir=/lib pkgdatadir=/data
+
+# Install into our private directory
+make install DESTDIR="${DESTDIR}" pkglibdir=/lib pkgdatadir=/
+i586-mingw32msvc-strip "${DESTDIR}/"*.exe
+rm -Rf "${DESTDIR}/man"
+rm -Rf "${DESTDIR}/include"
+rm -f "${DESTDIR}/caca-config"
+rm -f "${DESTDIR}/"*.a
+mv "${DESTDIR}/share/doc/libcaca-dev/html" "${DESTDIR}/html"
+mv "${DESTDIR}/share/doc/libcaca-dev/ps" "${DESTDIR}/doc"
+mv "${DESTDIR}/share/doc/libcaca-dev/"* "${DESTDIR}/doc"
+rmdir "${DESTDIR}/share/doc/libcaca-dev"
+rmdir "${DESTDIR}/share/doc"
+rmdir "${DESTDIR}/share"
+
+# Pack the directory
+zip "${DIRNAME}.zip" `find "${DIRNAME}"`
+rm -Rf "${DIRNAME}"
+
diff --git a/debian/Makefile.am b/debian/Makefile.am
index e564831..fdf9d63 100644
--- a/debian/Makefile.am
+++ b/debian/Makefile.am
@@ -1 +1,3 @@
+# $Id: foo$
+
 EXTRA_DIST = changelog compat control copyright rules
diff --git a/doc/Makefile.am b/doc/Makefile.am
index 949174a..fa045f1 100644
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -1,3 +1,5 @@
+# $Id: foo$
+
 EXTRA_DIST = doxygen.cfg.in footer.html header.html $(man_MANS)
 
 man_MANS = caca-config.1 cacademo.1 cacaview.1
diff --git a/examples/Makefile.am b/examples/Makefile.am
index 6b26544..9d655ed 100644
--- a/examples/Makefile.am
+++ b/examples/Makefile.am
@@ -1,6 +1,4 @@
-###############################################################################
-# Automake targets and declarations for libcaca example programs
-###############################################################################
+# $Id: foo$
 
 pkgdata_DATA = caca.txt
 
diff --git a/src/Makefile.am b/src/Makefile.am
index 16248d1..0a31331 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,6 +1,4 @@
-###############################################################################
-# Automake targets and declarations for libcaca
-###############################################################################
+# $Id: foo$
 
 include_HEADERS = caca.h
 
diff --git a/test/Makefile.am b/test/Makefile.am
index 6de4136..ce36bf3 100644
--- a/test/Makefile.am
+++ b/test/Makefile.am
@@ -1,6 +1,4 @@
-###############################################################################
-# Automake targets and declarations for libcaca test programs
-###############################################################################
+# $Id: foo$
 
 noinst_PROGRAMS = dithering event hsv optipal spritedit