diff --git a/autogen.sh b/autogen.sh
index f09345441..1af45b0a1 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -38,6 +38,9 @@ test $TEST_TYPE $FILE || {
     exit 1
 }
 
+# XXX: This is a kludge until I sort out the config/includes situation.
+touch ${srcdir}/aegisub/posix/config.h
+
 # bmp -> xmp via the res.rc
 if [ ! -f ${srcdir}/aegisub/bitmaps/Makefile.bitmaps ]; then
 	cat ${srcdir}/aegisub/res.rc | ${AWK_BIN} -f ${srcdir}/aegisub/bitmaps/genxpm.awk > ${srcdir}/aegisub/bitmaps/Makefile.bitmaps
@@ -46,7 +49,7 @@ cd ${srcdir}/aegisub/bitmaps
 make -f Makefile.bitmaps
 cd ${srcdir}
 
-awk '/BITMAP/ { image[count] = $1; ++count} END { printf("EXTRA_DIST="); for (v in image) printf(" \\\n %s", image[v])}' \
+awk '/BITMAP/ { image[count] = $1; ++count} END { printf("EXTRA_DIST="); for (v in image) printf(" \\\n	%s_xpm.xpm", image[v])}' \
   ${srcdir}/aegisub/res.rc \
   > ${srcdir}/aegisub/bitmaps/Makefile.am