diff --git a/docs/installation/raspberrypi.rst b/docs/installation/raspberrypi.rst
index c13e3ec4..a11aec9c 100644
--- a/docs/installation/raspberrypi.rst
+++ b/docs/installation/raspberrypi.rst
@@ -74,12 +74,12 @@ you a lot better performance.
 #. Install Mopidy and its dependencies as described in :ref:`debian-install`.
 
 #. Finally, you need to set a couple of :doc:`config values </config>`, and
-   then you're ready to :doc:`run Mopidy </running>`. Alternatively you may 
+   then you're ready to :doc:`run Mopidy </running>`. Alternatively you may
    want to have Mopidy run as a :doc:`system service </debian>`, automatically
    starting at boot.
 
 
-Appendix: Fixing audio quality issues
+Appendix A: Fixing audio quality issues
 =====================================
 
 As of about April 2013 the following steps should resolve any audio
@@ -141,3 +141,32 @@ not determined the exact revision that fixed this::
 The only remaining known issue is a slight gap in playback at track changes
 this is likely due to gapless playback not being implemented and is being
 worked on irrespective of Raspberry Pi related work.
+
+
+Appendix B: XBMC not booting?
+=============================
+
+A very important note for Raspbmc users. Due to a dependency version problem
+you might have to make some minor configurations for XBMC to start
+properly (this depends on your system’s version).
+
+If you notice that XBMC is not starting but gets stuck in a loop,
+you need to make the following changes.
+In short, what you have to do is the following::
+
+    sudo ln -sf /home/pi/.xbmc-current/xbmc-bin/lib/xbmc/system/libtag.so.1 \
+        /usr/lib/arm-linux-gnueabihf/libtag.so.1
+
+However, this will not persist the changes.
+To persist the changes edit :file:`/etc/ld.so.conf.d/arm-linux-gnueabihf.conf`
+and add the following at the top::
+
+    /home/pi/.xbmc-current/xbmc-bin/lib/xbmc/system
+
+It's very important to add it at the top of the file as this indicates the priority of the folder
+in which to look for shared libraries. XBMC doesn't play nicely with the system wide installed
+version of libtag (that got installed with Mopidy) but rather vendors in it's own version.
+Hopefully this will fix the issue for you if you're running Raspbmc.
+More info about this issue can be found in this `post <http://geeks.noeit.com/xbmc-library-dependency-error/>` _ as well.
+Please note that if you're running Xbian or any other distribution that the instructions might vary.
+