diff --git a/BUGS b/BUGS
index b8efbd9cac..92eb17c76e 100755
--- a/BUGS
+++ b/BUGS
@@ -5,3 +5,7 @@
 * In general Asterisk is a very new program, and there are liable to be
   many bugs yet to be discovered, so if you think you've found one, please
   be sure to report it.
+
+* When you flip to call waiting on a tormenta channel while you have a
+  three way call up, the parties in the three way cannot hear one another
+  in the general case.
diff --git a/formats/Makefile b/formats/Makefile
index f38101f3c1..9ac50c63b1 100755
--- a/formats/Makefile
+++ b/formats/Makefile
@@ -11,7 +11,7 @@
 # the GNU General Public License
 #
 
-FORMAT_LIBS=format_g723.so format_wav.so format_mp3.so format_wav_gsm.so format_gsm.so format_vox.so
+FORMAT_LIBS=format_g723.so format_wav.so format_mp3.so format_wav_gsm.so format_gsm.so format_vox.so format_pcm.so
 
 GSMLIB=../codecs/gsm/lib/libgsm.a
 
@@ -25,9 +25,6 @@ clean:
 %.so : %.o
 	$(CC) -shared -Xlinker -x -o $@ $<
 
-format_wav.so : format_wav.o
-	$(CC) -shared -Xlinker -x -o $@ $< -laudiofile
-
 format_mp3.so : format_mp3.o
 	$(CC) -shared -Xlinker -x -o $@ $< -lm