diff --git a/dev_tools/fabric/fab_liquidsoap_compile.py b/dev_tools/fabric/fab_liquidsoap_compile.py
index 8604cc7b8..0db5ed501 100644
--- a/dev_tools/fabric/fab_liquidsoap_compile.py
+++ b/dev_tools/fabric/fab_liquidsoap_compile.py
@@ -195,6 +195,7 @@ def compile_liquidsoap(filename="liquidsoap"):
     sed('%s/liquidsoap-1.0.1-full/PACKAGES' % root, '#ocaml-portaudio', 'ocaml-portaudio')
     sed('%s/liquidsoap-1.0.1-full/PACKAGES' % root, '#ocaml-alsa', 'ocaml-alsa')
     sed('%s/liquidsoap-1.0.1-full/PACKAGES' % root, '#ocaml-pulseaudio', 'ocaml-pulseaudio')
+    sed('%s/liquidsoap-1.0.1-full/PACKAGES' % root, '#ocaml-faad', 'ocaml-faad')
     do_run('cd %s/liquidsoap-1.0.1-full && ./bootstrap' % root)
     do_run('cd %s/liquidsoap-1.0.1-full && ./configure' % root)
     do_run('cd %s/liquidsoap-1.0.1-full && make' % root)
diff --git a/utils/airtime-test-stream.py b/utils/airtime-test-stream.py
index df8bd500c..b7d887c0d 100644
--- a/utils/airtime-test-stream.py
+++ b/utils/airtime-test-stream.py
@@ -84,7 +84,8 @@ try:
     print "Port: %s" % port
     print "User: %s" % user
     print "Password: %s" % password
-    print "Mount: %s\n" % mount
+    if stream_type == "icecast":
+        print "Mount: %s\n" % mount
     
     url = "http://%s:%s/%s" % (host, port, mount)
     print "Outputting to %s streaming server. You should be able to hear a monotonous tone on '%s'. Press ctrl-c to quit." % (stream_type, url)
@@ -97,7 +98,8 @@ try:
     if stream_type == "icecast":
         command = "%s 'output.icecast(%%vorbis, host = \"%s\", port = %s, user= \"%s\", password = \"%s\", mount=\"%s\", sine())'" % (liquidsoap_exe, host, port, user, password, mount)
     else:
-        command = "%s 'output.shoutcast(%%mp3, host=\"%s\", port = %s, user= \"%s\", password = \"%s\", mount=\"%s\",  sine())'" % (liquidsoap_exe, host, port, user, password, mount)
+        command = "%s /usr/lib/airtime/pypo/bin/liquidsoap_scripts/library/pervasives.liq 'output.shoutcast(%%mp3, host=\"%s\", port = %s, user= \"%s\", password = \"%s\", sine())'" \
+        % (liquidsoap_exe, host, port, user, password)
         
     if not verbose:
         command += " 2>/dev/null | grep \"failed\""