diff --git a/docs/changes.rst b/docs/changes.rst
index f6058708..f44bf912 100644
--- a/docs/changes.rst
+++ b/docs/changes.rst
@@ -29,6 +29,11 @@ We got an updated :doc:`release roadmap <development/roadmap>`!
   - ``noidle`` command now returns ``OK`` instead of an error. Should make some
     clients work a bit better.
 
+- Libspotify backend:
+
+  - Fix choppy playback using the Libspotify backend by using blocking ALSA
+    mode. (Fixes: GH-7)
+
 
 0.1.0a2 (2010-06-02)
 ====================
diff --git a/mopidy/backends/libspotify.py b/mopidy/backends/libspotify.py
index b4b809b3..ada857ad 100644
--- a/mopidy/backends/libspotify.py
+++ b/mopidy/backends/libspotify.py
@@ -15,6 +15,8 @@ from mopidy.backends import (BaseBackend, BaseCurrentPlaylistController,
 from mopidy.models import Artist, Album, Track, Playlist
 from mopidy.utils import spotify_uri_to_int
 
+import alsaaudio
+
 logger = logging.getLogger('mopidy.backends.libspotify')
 
 ENCODING = 'utf-8'
@@ -180,7 +182,7 @@ class LibspotifySessionManager(SpotifySessionManager, threading.Thread):
         threading.Thread.__init__(self)
         self.core_queue = core_queue
         self.connected = threading.Event()
-        self.audio = audio_controller_class()
+        self.audio = audio_controller_class(alsaaudio.PCM_NORMAL)
         self.session = None
 
     def run(self):