diff --git a/TODO b/TODO
index f229dcaf1a..bfcbdf4c80 100644
--- a/TODO
+++ b/TODO
@@ -17,3 +17,4 @@
 
 * check options in a52, it has some arch stuff and some opti stuff that 
   looks dodgy
+
diff --git a/configure.ac b/configure.ac
index 89fe6d4e78..1e4660c3c8 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1152,6 +1152,7 @@ sys/xvideo/Makefile
 ext/Makefile
 ext/a52/Makefile
 ext/aalib/Makefile
+ext/alsa/Makefile
 ext/audiofile/Makefile
 ext/esd/Makefile
 ext/lame/Makefile
diff --git a/ext/Makefile.am b/ext/Makefile.am
index 2b2aca0124..ff91846e69 100644
--- a/ext/Makefile.am
+++ b/ext/Makefile.am
@@ -10,6 +10,12 @@ else
 AALIB_DIR=
 endif
 
+if USE_ALSA
+ALSA_DIR=alsa
+else
+ALSA_DIR=
+endif
+
 if USE_AUDIOFILE
 AUDIOFILE_DIR=audiofile
 else
@@ -47,8 +53,8 @@ VORBIS_DIR=
 endif
 
 
-SUBDIRS=$(A52_DIR) $(AALIB_DIR) $(AUDIOFILE_DIR) $(ESD_DIR) \
+SUBDIRS=$(A52_DIR) $(AALIB_DIR) $(ALSA_DIR) $(AUDIOFILE_DIR) $(ESD_DIR) \
         $(LAME_DIR) $(MAD_DIR) \
 	$(SDL_DIR) $(VORBIS_DIR)
 
-DIST_SUBDIRS=a52 aalib audiofile esd lame mad sdl vorbis
+DIST_SUBDIRS=a52 aalib alsa audiofile esd lame mad sdl vorbis