diff --git a/docs/faq/gst-uninstalled b/docs/faq/gst-uninstalled
index 3add341401..85c7b976d7 100755
--- a/docs/faq/gst-uninstalled
+++ b/docs/faq/gst-uninstalled
@@ -46,13 +46,23 @@ if test ! -e $GST; then
 fi
 
 # set up a bunch of paths
-PATH=$GST/gstreamer/tools:$GST/gst-plugins/tools:$GST/gst-player/src:$GST/gst-editor/src:$GST/prefix/bin:$PATH
+PATH="\
+$GST/gstreamer/tools:\
+$GST/gst-plugins-base/tools:\
+$GST/gst-player/src:\
+$GST/gst-editor/src:\
+$GST/prefix/bin:\
+$PATH"
 
 # /some/path: makes the dynamic linker look in . too, so avoid this
 LD_LIBRARY_PATH=$GST/prefix/lib${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH}
 DYLD_LIBRARY_PATH=$GST/prefix/lib${DYLD_LIBRARY_PATH:+:$DYLD_LIBRARY_PATH}
 
-# Gstreamer ffmpeg libraries
+# GStreamer rtsp server library
+LD_LIBRARY_PATH=$GST/gst-rtsp-server/gst/rtsp-server/.libs:$LD_LIBRARY_PATH
+DYLD_LIBRARY_PATH=$GST/gst-rtsp-server/gst/rtsp-server/.libs:$DYLD_LIBRARY_PATH
+
+# GStreamer ffmpeg libraries
 for path in libavformat libavutil libavcodec libpostproc libavdevice
 do
    LD_LIBRARY_PATH=$GST/gst-ffmpeg/gst-libs/ext/ffmpeg/$path:$LD_LIBRARY_PATH
@@ -77,8 +87,28 @@ DYLD_LIBRARY_PATH=$GST/gstreamer/gst/.libs:$DYLD_LIBRARY_PATH
 export LD_LIBRARY_PATH
 export DYLD_LIBRARY_PATH
   
-export PKG_CONFIG_PATH=$GST/prefix/lib/pkgconfig:$GST/gstreamer/pkgconfig:$GST/gst-plugins/pkgconfig:$GST/gst-plugins-base/pkgconfig:$GST/gst-plugins-good/pkgconfig:$GST/gst-python/pkgconfig${PKG_CONFIG_PATH:+:$PKG_CONFIG_PATH}
-export GST_PLUGIN_PATH=$GST/gstreamer:$GST/gst-plugins:$GST/gst-plugins-base:$GST/gst-plugins-good:$GST/gst-plugins-ugly:$GST/gst-plugins-bad:$GST/gst-ffmpeg:$GST/gnonlin:$GST/gst-openmax:$GST/gst-plugins-gl:$GST/plugins${GST_PLUGIN_PATH:+:$GST_PLUGIN_PATH}
+export PKG_CONFIG_PATH="\
+$GST/prefix/lib/pkgconfig\
+:$GST/gstreamer/pkgconfig\
+:$GST/gst-plugins-base/pkgconfig\
+:$GST/gst-plugins-good/pkgconfig\
+:$GST/gst-python/pkgconfig\
+:$GST/gst-rtsp-server/pkgconfig\
+${PKG_CONFIG_PATH:+:$PKG_CONFIG_PATH}"
+
+export GST_PLUGIN_PATH="\
+$GST/gstreamer\
+:$GST/gst-plugins-base\
+:$GST/gst-plugins-good\
+:$GST/gst-plugins-ugly\
+:$GST/gst-plugins-bad\
+:$GST/gst-ffmpeg\
+:$GST/gnonlin\
+:$GST/gst-openmax\
+:$GST/gst-plugins-gl\
+:$GST/plugins\
+${GST_PLUGIN_PATH:+:$GST_PLUGIN_PATH}"
+
 # don't use any system-installed plug-ins at all
 export GST_PLUGIN_SYSTEM_PATH=
 # set our registry somewhere else so we don't mess up the registry generated