diff --git a/Makefile.am b/Makefile.am
index f62d6fae04c19b68d769228c6f76f3019ecd3ca8..5dcd14f7702c805c57b38a970fb417c1e6722dec 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -2,7 +2,7 @@
 
 AUTOMAKE_OPTIONS = foreign dist-zip
 
-SUBDIRS = src conf
+SUBDIRS = src conf doc web win32
 
 EXTRA_DIST = README AUTHORS COPYING
 
diff --git a/TODO b/TODO
index 3ba203b14bd75819c7e84d23dce02d83e7e036e2..633be566e79b55e4a60514da90d28dbb5bc6f77b 100644
--- a/TODO
+++ b/TODO
@@ -2,14 +2,21 @@ BUGS
 ----
 - stats get off?  this needs testing more testing.
 
-- autoconf doesn't set HAS_POLL 
+- autoconf doesn't set HAVE_POLL 
 
 - automake isn't installing things (conf, web) correctly.
 
+- some stuff (like 'genre') isn't making it into the stats dump
+
+- thread_join uses thread->sys_thread, but thread structure has
+  already been freed in thread_exit()
+
 
 FEATURES
 --------
-- pull out vorbis comments.  and send to stats.
+
+- pull out vorbis comments.  and send to stats. This seems to be being
+  done, but it isn't working right.
 
 - directory server GUID checks
 	directory server does GET /GUID-asldjfasldfjalsdkfjasldkfj HTTP/1.0
diff --git a/configure.in b/configure.in
index 3e50b4737b6d029e10b46de0cccb401b7fe3c728..f3e0a5ed07c4998f2c3f9da308e426f668d100d3 100644
--- a/configure.in
+++ b/configure.in
@@ -1,7 +1,7 @@
 dnl Process this file with autoconf to produce a configure script.
 AC_INIT(src/main.c)
 
-AM_INIT_AUTOMAKE(icecast,2.0)
+AM_INIT_AUTOMAKE(icecast,2.0-alpha-1)
 
 AC_PROG_CC
 AC_CANONICAL_HOST
@@ -163,4 +163,4 @@ AC_SUBST(DEBUG)
 AC_SUBST(CFLAGS)
 AC_SUBST(PROFILE)
 
-AC_OUTPUT(Makefile conf/Makefile src/Makefile src/avl/Makefile src/httpp/Makefile src/thread/Makefile src/log/Makefile src/net/Makefile src/timing/Makefile)
+AC_OUTPUT(Makefile conf/Makefile src/Makefile src/avl/Makefile src/httpp/Makefile src/thread/Makefile src/log/Makefile src/net/Makefile src/timing/Makefile doc/Makefile web/Makefile win32/Makefile win32/res/Makefile)
diff --git a/doc/Makefile.am b/doc/Makefile.am
new file mode 100644
index 0000000000000000000000000000000000000000..5f10a45dfb039f7b452e7cec5317bc37406e4606
--- /dev/null
+++ b/doc/Makefile.am
@@ -0,0 +1,8 @@
+## Process this file with automake to produce Makefile.in
+
+AUTOMAKE_OPTIONS = foreign
+
+EXTRA_DIST = Index.hhk icecast2.chm icecast2.hhc icecast2.hhp index_win32.html \
+           stats1.jpg style.css win32_section1.html win32_section2.html \
+           win32_section3.html windowtitle.jpg
+
diff --git a/src/Makefile.am b/src/Makefile.am
index 10f94eb93cf47e0505ebbb3232df707fe7bd1243..e7043183cff65c8cb2d11cee7249ea4b6f7d0bbd 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -8,7 +8,7 @@ bin_PROGRAMS = icecast
 
 noinst_HEADERS = config.h os.h logging.h sighandler.h connection.h global.h\
 	 util.h slave.h source.h stats.h refbuf.h client.h format.h format_vorbis.h\
-	 compat.h format_mp3.h fserve.h
+	 compat.h format_mp3.h fserve.h xslt.h
 icecast_SOURCES = config.c main.c logging.c sighandler.c connection.c global.c\
 	 util.c slave.c source.c stats.c refbuf.c client.c format.c format_vorbis.c\
 	 format_mp3.c xslt.c fserve.c
diff --git a/web/Makefile.am b/web/Makefile.am
new file mode 100644
index 0000000000000000000000000000000000000000..67c637d095c063238eb42a55ef44c5742f935df9
--- /dev/null
+++ b/web/Makefile.am
@@ -0,0 +1,6 @@
+## Process this file with automake to produce Makefile.in
+
+AUTOMAKE_OPTIONS = foreign
+
+EXTRA_DIST = status.xsl status2.xsl
+
diff --git a/win32/Makefile.am b/win32/Makefile.am
new file mode 100644
index 0000000000000000000000000000000000000000..1cdb0f9251ce91135bd8115b11f5ee9c590060b3
--- /dev/null
+++ b/win32/Makefile.am
@@ -0,0 +1,14 @@
+## Process this file with automake to produce Makefile.in
+
+AUTOMAKE_OPTIONS = foreign
+
+SUBDIRS = res
+
+EXTRA_DIST = ConfigTab.cpp ConfigTab.h Icecast2win.clw Icecast2win.cpp \
+    Icecast2win.dsp Icecast2win.dsw Icecast2win.h Icecast2win.rc \
+    Icecast2winDlg.cpp Icecast2winDlg.h Makefile.am ResizableDialog.cpp \
+    ResizableDialog.h StatsTab.cpp StatsTab.h Status.cpp Status.h StdAfx.cpp \
+    StdAfx.h TabCtrlSSL.cpp TabCtrlSSL.h TabPageSSL.cpp TabPageSSL.h black.bmp \
+    colors.h icecast.dsp icecast.ico icecast.xml icecast2.iss icecast2logo2.bmp\
+    resource.h running.bmp status.xsl status2.xsl stopped.bmp
+
diff --git a/win32/res/Makefile.am b/win32/res/Makefile.am
new file mode 100644
index 0000000000000000000000000000000000000000..c65cf6063bc68c02865415652c55a1cd16ca68a1
--- /dev/null
+++ b/win32/res/Makefile.am
@@ -0,0 +1,6 @@
+## Process this file with automake to produce Makefile.in
+
+AUTOMAKE_OPTIONS = foreign
+
+EXTRA_DIST = Icecast2win.rc2
+