diff --git a/xine-lib-1.1.17-avsync_hack.patch b/xine-lib-1.1.17-avsync_hack.patch
new file mode 100644
index 0000000..5fa1ae1
--- /dev/null
+++ b/xine-lib-1.1.17-avsync_hack.patch
@@ -0,0 +1,22 @@
+diff -up xine-lib-1.1.17/src/xine-engine/audio_out.c.avsync_hack xine-lib-1.1.17/src/xine-engine/audio_out.c
+--- xine-lib-1.1.17/src/xine-engine/audio_out.c.avsync_hack	2009-11-30 19:33:30.000000000 -0600
++++ xine-lib-1.1.17/src/xine-engine/audio_out.c	2009-12-02 09:07:37.622805780 -0600
+@@ -1156,8 +1156,17 @@ static void *ao_loop (void *this_gen) {
+ 
+     /*
+      * calculate gap:
++     *
++     * HACK (rwa): If we have no video stream we do not need an AV sync and so
++     *             we assume a gap of 0. This seems to avoid the skips in the
++     *             first seconds when playing audio-only via the "glitch-free"
++     *             pulseaudio server.
+      */
+-    gap = in_buf->vpts - hw_vpts;
++    if (in_buf && in_buf->stream && in_buf->stream->video_decoder_plugin) {
++       gap = in_buf->vpts - hw_vpts;
++    } else {
++       gap = 0;
++    }
+     lprintf ("hw_vpts : %" PRId64 " buffer_vpts : %" PRId64 " gap : %" PRId64 "\n",
+              hw_vpts, in_buf->vpts, gap);
+ 
diff --git a/xine-lib-1.1.17-no_autopoint.patch b/xine-lib-1.1.17-no_autopoint.patch
new file mode 100644
index 0000000..d5ee0cd
--- /dev/null
+++ b/xine-lib-1.1.17-no_autopoint.patch
@@ -0,0 +1,17 @@
+diff -up xine-lib-1.1.17/autogen.sh.no_autopoint xine-lib-1.1.17/autogen.sh
+--- xine-lib-1.1.17/autogen.sh.no_autopoint	2009-10-09 09:33:31.000000000 -0500
++++ xine-lib-1.1.17/autogen.sh	2009-12-02 09:15:48.534555467 -0600
+@@ -229,10 +229,10 @@ run_aclocal () {
+     echo
+   fi
+   
+-  echo $_echo_n " + Running autopoint: $_echo_c"
++  #echo $_echo_n " + Running autopoint: $_echo_c"
+   
+-  autopoint
+-  echo "done." 
++  #autopoint
++  #echo "done." 
+ 
+   echo $_echo_n " + Running aclocal: $_echo_c"
+