diff --git a/indra/cmake/GStreamer010Plugin.cmake b/indra/cmake/GStreamer010Plugin.cmake
index 2b45a1abc..90ed35c81 100644
--- a/indra/cmake/GStreamer010Plugin.cmake
+++ b/indra/cmake/GStreamer010Plugin.cmake
@@ -6,11 +6,13 @@ if (STANDALONE)
 
   pkg_check_modules(GSTREAMER010 REQUIRED gstreamer-0.10)
   pkg_check_modules(GSTREAMER010_PLUGINS_BASE REQUIRED gstreamer-plugins-base-0.10)
-elseif (LINUX)
+
+else (STANDALONE)
+
+  # Possibly libxml and glib should have their own .cmake file instead...
   use_prebuilt_binary(glib)			# gstreamer needs glib
-  use_prebuilt_binary(gstreamer)
-  # possible libxml should have its own .cmake file instead
   use_prebuilt_binary(libxml)
+  use_prebuilt_binary(gstreamer)
   set(GSTREAMER010_FOUND ON FORCE BOOL)
   set(GSTREAMER010_PLUGINS_BASE_FOUND ON FORCE BOOL)
   set(GSTREAMER010_INCLUDE_DIRS
@@ -18,23 +20,47 @@ elseif (LINUX)
       ${LIBS_PREBUILT_DIR}/${LL_ARCH_DIR}/include/glib-2.0
       ${LIBS_PREBUILT_DIR}/${LL_ARCH_DIR}/include/libxml2
       )
+
+endif (STANDALONE)
+
+if (WINDOWS)
   # We don't need to explicitly link against gstreamer itself, because
   # LLMediaImplGStreamer probes for the system's copy at runtime.
-  set(GSTREAMER010_LIBRARIES
-      gobject-2.0
-      gmodule-2.0
-      dl
-      gthread-2.0
-      rt
-      glib-2.0
-      )
-endif (STANDALONE)
+    set(GSTREAMER010_LIBRARIES
+         libgstvideo
+         libgstaudio
+         libgstbase-0.10
+         libgstreamer-0.10
+         gobject-2.0
+         gmodule-2.0
+         gthread-2.0
+         glib-2.0
+         )
+else (WINDOWS)
+  # We don't need to explicitly link against gstreamer itself, because
+  # LLMediaImplGStreamer probes for the system's copy at runtime.
+    set(GSTREAMER010_LIBRARIES
+         gstvideo-0.10
+         gstaudio-0.10
+         gstbase-0.10
+         gstreamer-0.10
+         gobject-2.0
+         gmodule-2.0
+         dl
+         gthread-2.0
+         rt
+         glib-2.0
+         )
+
+
+endif (WINDOWS)
+
 
 if (GSTREAMER010_FOUND AND GSTREAMER010_PLUGINS_BASE_FOUND)
   set(GSTREAMER010 ON CACHE BOOL "Build with GStreamer-0.10 streaming media support.")
+  add_definitions(-DLL_GSTREAMER010_ENABLED=1)
 endif (GSTREAMER010_FOUND AND GSTREAMER010_PLUGINS_BASE_FOUND)
 
-if (GSTREAMER010)
-  add_definitions(-DLL_GSTREAMER010_ENABLED=1)
-endif (GSTREAMER010)
+  
+