diff --git a/pkgs/applications/audio/mopidy/default.nix b/pkgs/applications/audio/mopidy/default.nix
index d285c4b0e2373..4d34c8ccbf5f9 100644
--- a/pkgs/applications/audio/mopidy/default.nix
+++ b/pkgs/applications/audio/mopidy/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchgit, pythonPackages, pygobject, gst_python
+{ stdenv, fetchgit, pythonPackages, pygobject
 , gst_plugins_good, gst_plugins_base
 }:
 
@@ -28,8 +28,8 @@ pythonPackages.buildPythonPackage rec {
   postInstall = ''
     for p in $out/bin/mopidy $out/bin/mopidy-scan; do
       wrapProgram $p \
-        --prefix GST_PLUGIN_PATH : ${gst_plugins_good}/lib/gstreamer-0.10 \
-        --prefix GST_PLUGIN_PATH : ${gst_plugins_base}/lib/gstreamer-0.10
+        --prefix GST_PLUGIN_PATH : ${gst_plugins_good}/lib/gstreamer-* \
+        --prefix GST_PLUGIN_PATH : ${gst_plugins_base}/lib/gstreamer-*
     done
   '';
 
diff --git a/pkgs/applications/audio/mopidy/git.nix b/pkgs/applications/audio/mopidy/git.nix
index 2b5e1627ac63c..26a82002690c6 100644
--- a/pkgs/applications/audio/mopidy/git.nix
+++ b/pkgs/applications/audio/mopidy/git.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchgit, pythonPackages, pygobject, gst_python
+{ stdenv, fetchgit, pythonPackages, pygobject
 , gst_plugins_good, gst_plugins_base
 }:
 
@@ -28,8 +28,8 @@ pythonPackages.buildPythonPackage rec {
   postInstall = ''
     for p in $out/bin/mopidy $out/bin/mopidy-scan; do
       wrapProgram $p \
-        --prefix GST_PLUGIN_PATH : ${gst_plugins_good}/lib/gstreamer-0.10 \
-        --prefix GST_PLUGIN_PATH : ${gst_plugins_base}/lib/gstreamer-0.10
+        --prefix GST_PLUGIN_PATH : ${gst_plugins_good}/lib/gstreamer-* \
+        --prefix GST_PLUGIN_PATH : ${gst_plugins_base}/lib/gstreamer-*
     done
   '';
 
diff --git a/pkgs/applications/networking/browsers/uzbl/default.nix b/pkgs/applications/networking/browsers/uzbl/default.nix
index 4c6458d909fd9..7f015e561fc72 100644
--- a/pkgs/applications/networking/browsers/uzbl/default.nix
+++ b/pkgs/applications/networking/browsers/uzbl/default.nix
@@ -32,7 +32,7 @@ rec {
       --prefix GST_PLUGIN_PATH : ${a.webkit.gstreamer}/lib/gstreamer-* \
       --prefix GST_PLUGIN_PATH : ${a.webkit.gst_plugins_base}/lib/gstreamer-* \
       --prefix GST_PLUGIN_PATH : ${a.webkit.gst_plugins_good}/lib/gstreamer-* \
-      --prefix GST_PLUGIN_PATH : ${a.webkit.gst_ffmpeg}/lib/gstreamer-* \
+      --prefix GST_PLUGIN_PATH : ${a.webkit.gst_libav}/lib/gstreamer-* \
       --prefix GIO_EXTRA_MODULES : ${a.glib_networking}/lib/gio/modules
     '';
 
diff --git a/pkgs/applications/networking/instant-messengers/baresip/default.nix b/pkgs/applications/networking/instant-messengers/baresip/default.nix
index ba530374c71f8..cebaf62e5eeec 100644
--- a/pkgs/applications/networking/instant-messengers/baresip/default.nix
+++ b/pkgs/applications/networking/instant-messengers/baresip/default.nix
@@ -1,5 +1,5 @@
 {stdenv, fetchurl, zlib, openssl, libre, librem, pkgconfig
-, cairo, mpg123, gstreamer, gst_ffmpeg, gst_plugins_base, gst_plugins_bad
+, cairo, mpg123, gstreamer, gst_libav, gst_plugins_base, gst_plugins_bad
 , gst_plugins_good, alsaLib, SDL, libv4l, celt, libsndfile, srtp, ffmpeg
 , gsm, speex, portaudio, spandsp, libuuid
 }:
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
     sha256 = "3ac15b3d3cf17b2417ba871e7eaaaf41ab10cb30b900adcee357d5e91ea033e7";
   };
   buildInputs = [zlib openssl libre librem pkgconfig
-    cairo mpg123 gstreamer gst_ffmpeg gst_plugins_base gst_plugins_bad gst_plugins_good
+    cairo mpg123 gstreamer gst_libav gst_plugins_base gst_plugins_bad gst_plugins_good
     alsaLib SDL libv4l celt libsndfile srtp ffmpeg gsm speex portaudio spandsp libuuid
     ];
   makeFlags = [
diff --git a/pkgs/applications/networking/instant-messengers/gajim/default.nix b/pkgs/applications/networking/instant-messengers/gajim/default.nix
index 1def7e2b1f017..260c09f44cd48 100644
--- a/pkgs/applications/networking/instant-messengers/gajim/default.nix
+++ b/pkgs/applications/networking/instant-messengers/gajim/default.nix
@@ -9,7 +9,7 @@ let
     libXt xproto libXext xextproto libX11 gtkspell aspell
     scrnsaverproto pycrypto pythonDBus pythonSexy 
     docutils pyasn1 farstream gst_plugins_bad gstreamer
-    gst_ffmpeg gst_python
+    gst_libav
   ];
 in
 rec {
@@ -38,7 +38,7 @@ rec {
       sed -e 's^'"$i"'^'"$out/bin-wrapped/$name"'^' -i "$out/bin/$name"
       sed -e "2aexport LD_LIBRARY_PATH=\"\$LD_LIBRARY_PATH\''${LD_LIBRARY_PATH:+:}${a.gtkspell}/lib:${a.gtkspell}/lib64\"" -i "$out/bin/gajim"
       sed -e "2aexport NIX_LDFLAGS=\"\$NIX_LDFLAGS -L${a.gtkspell}/lib -L${a.gtkspell}/lib64\"" -i "$out/bin/gajim"
-      sed -e "2aexport GST_PLUGIN_PATH=\"\$GST_PLUGIN_PATH''${GST_PLUGIN_PATH:+:}$(echo ${a.gst_plugins_bad}/lib/gstreamer-*):$(echo ${a.gst_ffmpeg}/lib/gstreamer-*):$(echo ${a.farstream}/lib/gstreamer-*)\"" -i "$out/bin/gajim"
+      sed -e "2aexport GST_PLUGIN_PATH=\"\$GST_PLUGIN_PATH''${GST_PLUGIN_PATH:+:}$(echo ${a.gst_plugins_bad}/lib/gstreamer-*):$(echo ${a.gst_libav}/lib/gstreamer-*):$(echo ${a.farstream}/lib/gstreamer-*)\"" -i "$out/bin/gajim"
     done
   '') ["wrapBinContentsPython"];
 
diff --git a/pkgs/applications/video/gnash/default.nix b/pkgs/applications/video/gnash/default.nix
index db6bde782b99e..7486d1db0aae5 100644
--- a/pkgs/applications/video/gnash/default.nix
+++ b/pkgs/applications/video/gnash/default.nix
@@ -1,6 +1,6 @@
 { stdenv, fetchurl
 , SDL, SDL_mixer, gstreamer, gst_plugins_base, gst_plugins_good
-, gst_ffmpeg, speex
+, gst_libav, speex
 , libogg, libxml2, libjpeg, mesa, libpng, libungif, libtool
 , boost, freetype, agg, dbus, curl, pkgconfig, gettext
 , glib, gtk, gtkglext, x11, ming, dejagnu, python, perl
@@ -45,7 +45,7 @@ stdenv.mkDerivation rec {
   # XXX: KDE is supported as well so we could make it available optionally.
   buildInputs = [
     gettext x11 SDL SDL_mixer gstreamer gst_plugins_base gst_plugins_good
-    gst_ffmpeg speex libtool
+    gst_libav speex libtool
     libogg libxml2 libjpeg mesa libpng libungif boost freetype agg
     dbus curl pkgconfig glib gtk gtkglext
     xulrunner
@@ -65,9 +65,9 @@ stdenv.mkDerivation rec {
          --enable-gui=gtk"
 
        # In `libmedia', Gnash compiles with "-I$gst_plugins_base/include",
-       # whereas it really needs "-I$gst_plugins_base/include/gstreamer-0.10".
+       # whereas it really needs "-I$gst_plugins_base/include/gstreamer-*".
        # Work around this using GCC's $CPATH variable.
-       export CPATH="${gst_plugins_base}/include/gstreamer-0.10:${gst_plugins_good}/include/gstreamer-0.10"
+       export CPATH="${gst_plugins_base}/include/gstreamer-*:${gst_plugins_good}/include/gstreamer-*"
        echo "\$CPATH set to \`$CPATH'"
 
        echo "\$GST_PLUGIN_PATH set to \`$GST_PLUGIN_PATH'"
@@ -84,12 +84,12 @@ stdenv.mkDerivation rec {
     make install-plugins
 
     # Wrap programs so the find the GStreamer plug-ins they need
-    # (e.g., gst-ffmpeg is needed to watch movies such as YouTube's).
+    # (e.g., gst-libav is needed to watch movies such as YouTube's).
     for prog in "$out/bin/"*
     do
       wrapProgram "$prog" --prefix                                            \
         GST_PLUGIN_PATH ":"                                                     \
-        "${gst_plugins_base}/lib/gstreamer-0.10:${gst_plugins_good}/lib/gstreamer-0.10:${gst_ffmpeg}/lib/gstreamer-0.10"
+        "${gst_plugins_base}/lib/gstreamer-*:${gst_plugins_good}/lib/gstreamer-*:${gst_libav}/lib/gstreamer-*"
     done
   '';
 
diff --git a/pkgs/applications/video/transmageddon/default.nix b/pkgs/applications/video/transmageddon/default.nix
new file mode 100644
index 0000000000000..76f1401afde0c
--- /dev/null
+++ b/pkgs/applications/video/transmageddon/default.nix
@@ -0,0 +1,29 @@
+{ stdenv, fetchgit, autoconf, automake, libtool, makeWrapper
+, python, pygobject, intltool }:
+
+stdenv.mkDerivation rec {
+  name = "transmageddon-0.22";
+
+  preConfigure = "autoreconf -vfi";
+
+  src = fetchgit {
+    url = git://git.gnome.org/transmageddon;
+    rev = "8b1eedadae484b3fb6599d27ff4cbe9ec5e3a3b9";
+    sha256 = "97567a3e26e54d10f28374b514fdee5d87776d185b56c6b74c1eb0dae11bc5a8";
+  };
+
+  pythonPath = [ pygobject ];
+
+  postInstall = ''
+    wrapProgram "$out/bin/transmageddon" \
+      --set PYTHONPATH $(toPythonPath "${pygobject}"):$PYTHONPATH
+  '';
+
+  buildInputs = [ autoconf automake libtool makeWrapper intltool python ];
+
+  meta = {
+    homepage = http://www.linuxrising.org;
+    license = stdenv.lib.licenses.lgpl21;
+    description = "A video transcoder using GStreamer";
+  };
+}
diff --git a/pkgs/development/libraries/farsight2/default.nix b/pkgs/development/libraries/farsight2/default.nix
index cbb21073685c7..f0e45298de001 100644
--- a/pkgs/development/libraries/farsight2/default.nix
+++ b/pkgs/development/libraries/farsight2/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchurl, libnice, pkgconfig, python, gstreamer, gst_plugins_base
-, pygobject, gst_python, gupnp_igd }:
+, pygobject, gupnp_igd }:
 
 stdenv.mkDerivation rec {
   name = "farsight2-0.0.31";
@@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
     sha256 = "16qz4x14rdycm4nrn5wx6k2y22fzrazsbmihrxdwafx9cyf23kjm";
   };
 
-  buildInputs = [ libnice python pygobject gst_python gupnp_igd ];
+  buildInputs = [ libnice python pygobject gupnp_igd ];
 
   buildNativeInputs = [ pkgconfig ];
 
diff --git a/pkgs/development/libraries/farstream/default.nix b/pkgs/development/libraries/farstream/default.nix
index 3babcb8283371..f22921fd56241 100644
--- a/pkgs/development/libraries/farstream/default.nix
+++ b/pkgs/development/libraries/farstream/default.nix
@@ -1,6 +1,6 @@
 { stdenv, fetchurl, libnice, pkgconfig, python, gstreamer, gst_plugins_base
-, pygobject, gst_python, gupnp_igd
-, gst_plugins_good, gst_plugins_bad, gst_ffmpeg
+, pygobject, gupnp_igd
+, gst_plugins_good, gst_plugins_bad, gst_libav
 }:
 
 stdenv.mkDerivation rec {
@@ -14,9 +14,7 @@ stdenv.mkDerivation rec {
 
   buildNativeInputs = [ pkgconfig ];
 
-  propagatedBuildInputs = [ gstreamer gst_plugins_base gst_python 
-    gst_plugins_good gst_plugins_bad gst_ffmpeg
-    ];
+  propagatedBuildInputs = [ gstreamer gst_plugins_base gst_plugins_good gst_plugins_bad gst_libav ];
 
   meta = {
     homepage = http://www.freedesktop.org/wiki/Software/Farstream;
diff --git a/pkgs/development/libraries/gstreamer/gst-ffmpeg/default.nix b/pkgs/development/libraries/gstreamer/gst-ffmpeg/0.10.nix
similarity index 80%
rename from pkgs/development/libraries/gstreamer/gst-ffmpeg/default.nix
rename to pkgs/development/libraries/gstreamer/gst-ffmpeg/0.10.nix
index e7aaaa46a96a8..3007cd102db38 100644
--- a/pkgs/development/libraries/gstreamer/gst-ffmpeg/default.nix
+++ b/pkgs/development/libraries/gstreamer/gst-ffmpeg/0.10.nix
@@ -1,15 +1,19 @@
+
+# XXX: after gstream-1.0, this package became gst-libav. We're keeping this
+# around for phonon. 
+
 { fetchurl, stdenv, pkgconfig, gst_plugins_base, bzip2, yasm
 , useInternalFfmpeg ? false, ffmpeg ? null }:
 
 stdenv.mkDerivation rec {
-  name = "gst-ffmpeg-0.10.12";
+  name = "gst-ffmpeg-0.10.13";
 
   src = fetchurl {
     urls = [
       "http://gstreamer.freedesktop.org/src/gst-ffmpeg/${name}.tar.bz2"
       "mirror://gentoo/distfiles/${name}.tar.bz2"
       ];
-    sha256 = "0fyppl8q18g71jd2r0mbiqk8hhrdxq43dglma06mxyjb5c80fxxi";
+    sha256 = "0qmvgwcfybci78sd73mhvm4bsb7l0xsk9yljrgik80g011ds1z3n";
   };
 
   # Upstream strongly recommends against using --with-system-ffmpeg,
diff --git a/pkgs/development/libraries/gstreamer/gst-libav/default.nix b/pkgs/development/libraries/gstreamer/gst-libav/default.nix
new file mode 100644
index 0000000000000..5e60b2ec11adb
--- /dev/null
+++ b/pkgs/development/libraries/gstreamer/gst-libav/default.nix
@@ -0,0 +1,34 @@
+{ fetchurl, stdenv, autoconf, automake, libtool, pkgconfig
+, gst_plugins_base, bzip2, yasm
+, useInternalLibAV ? false, libav ? null }:
+
+stdenv.mkDerivation rec {
+  name = "gst-libav-${version}";
+  version = "1.0.5";
+
+  src = fetchurl {
+    urls = [
+      "${meta.homepage}/src/gst-libav/${name}.tar.xz"
+      "mirror://gentoo/distfiles/${name}.tar.xz"
+    ];
+    sha256 = "1m9jzga9ahml3dnfm7syz6mglmysqpbkkyr48kka9cwna1kbxy5f";
+  };
+
+  preConfigure = "autoreconf -vfi";
+
+  # Upstream strongly recommends against using --with-system-libav,
+  # but we do it anyway because we're so hardcore (and we don't want
+  # multiple copies of libav).
+  configureFlags = stdenv.lib.optionalString (!useInternalLibAV) "--with-system-libav";
+  enableParallelBuilding = true; 
+
+  buildInputs =
+    [ autoconf automake libtool pkgconfig bzip2 gst_plugins_base ]
+    ++ (if useInternalLibAV then [ yasm ] else [ libav ]);
+
+  meta = {
+    homepage = http://gstreamer.freedesktop.org;
+    description = "GStreamer's plug-in using LibAV";
+    license = "GPLv2+";
+  };
+}
diff --git a/pkgs/development/libraries/gstreamer/gst-plugins-bad/0.10.nix b/pkgs/development/libraries/gstreamer/gst-plugins-bad/0.10.nix
new file mode 100644
index 0000000000000..f57a66950155e
--- /dev/null
+++ b/pkgs/development/libraries/gstreamer/gst-plugins-bad/0.10.nix
@@ -0,0 +1,30 @@
+{ fetchurl, stdenv, pkgconfig, glib, gstreamer, gst_plugins_base
+, libdvdnav, libdvdread }:
+
+stdenv.mkDerivation rec {
+  name = "gst-plugins-bad-0.10.36";
+
+  src = fetchurl {
+    urls = [
+      "${meta.homepage}/src/gst-plugins-bad/${name}.tar.xz"
+      "mirror://gentoo/distfiles/${name}.tar.xz"
+      ];
+    sha256 = "0si79dsdx06w6p48v1c5ifbjhq26p4jn8swi18ni8x6j5yd5p3rf";
+  };
+
+  buildInputs =
+    [ pkgconfig glib gstreamer gst_plugins_base libdvdnav libdvdread ];
+
+  enableParallelBuilding = true;
+
+  meta = {
+    homepage = http://gstreamer.freedesktop.org;
+
+    description = "‘Bad’ (potentially low quality) plug-ins for GStreamer";
+
+    maintainers = [stdenv.lib.maintainers.raskin];
+    platforms = stdenv.lib.platforms.linux;
+
+    license = "LGPLv2+";
+  };
+}
diff --git a/pkgs/development/libraries/gstreamer/gst-plugins-bad/default.nix b/pkgs/development/libraries/gstreamer/gst-plugins-bad/default.nix
index 2d1309f3a3cff..8ec8098cb266b 100644
--- a/pkgs/development/libraries/gstreamer/gst-plugins-bad/default.nix
+++ b/pkgs/development/libraries/gstreamer/gst-plugins-bad/default.nix
@@ -2,14 +2,14 @@
 , libdvdnav, libdvdread }:
 
 stdenv.mkDerivation rec {
-  name = "gst-plugins-bad-0.10.22";
+  name = "gst-plugins-bad-1.0.5";
 
   src = fetchurl {
     urls = [
-      "${meta.homepage}/src/gst-plugins-bad/${name}.tar.bz2"
-      "mirror://gentoo/distfiles/${name}.tar.bz2"
+      "${meta.homepage}/src/gst-plugins-bad/${name}.tar.xz"
+      "mirror://gentoo/distfiles/${name}.tar.xz"
       ];
-    sha256 = "030728gf0zjg62yng4qy9yapaffbvkziawa28rk0gspz8cpi1xyq";
+    sha256 = "0si79dsdx06w6p48v1c5ifbjhq26p4jn8swi18ni8x6j5yd5p3rf";
   };
 
   buildInputs =
diff --git a/pkgs/development/libraries/gstreamer/gst-plugins-base/0.10.nix b/pkgs/development/libraries/gstreamer/gst-plugins-base/0.10.nix
new file mode 100644
index 0000000000000..2ac325dc2822e
--- /dev/null
+++ b/pkgs/development/libraries/gstreamer/gst-plugins-base/0.10.nix
@@ -0,0 +1,46 @@
+{ fetchurl, stdenv, pkgconfig, python, gstreamer
+, xlibs, alsaLib, cdparanoia, libogg
+, libtheora, libvorbis, freetype, pango
+, liboil, glib
+, # Whether to build no plugins that have external dependencies
+  # (except the ALSA plugin).
+  minimalDeps ? false
+}:
+
+stdenv.mkDerivation rec {
+  name = "gst-plugins-base-0.10.36";
+
+  src = fetchurl {
+    urls = [
+      "${meta.homepage}/src/gst-plugins-base/${name}.tar.xz"
+      "mirror://gentoo/distfiles/${name}.tar.xz"
+      ];
+    sha256 = "0jp6hjlra98cnkal4n6bdmr577q8mcyp3c08s3a02c4hjhw5rr0z";
+  };
+
+  patchPhase = ''
+    sed -i 's@/bin/echo@echo@g' configure
+    sed -i -e 's/^   /\t/' docs/{libs,plugins}/Makefile.in
+  '';
+
+  # TODO : v4l, libvisual
+  buildInputs =
+    [ pkgconfig glib alsaLib ]
+    ++ stdenv.lib.optionals (!minimalDeps)
+      [ xlibs.xlibs xlibs.libXv cdparanoia libogg libtheora libvorbis
+        freetype pango liboil
+      ];
+
+  propagatedBuildInputs = [ gstreamer ];
+ 
+  postInstall = "rm -rf $out/share/gtk-doc";
+  
+  meta = {
+    homepage = http://gstreamer.freedesktop.org;
+
+    description = "Base plug-ins for GStreamer";
+
+    license = "LGPLv2+";
+  };
+}
+
diff --git a/pkgs/development/libraries/gstreamer/gst-plugins-base/default.nix b/pkgs/development/libraries/gstreamer/gst-plugins-base/default.nix
index 2ac325dc2822e..56ee57122c3ed 100644
--- a/pkgs/development/libraries/gstreamer/gst-plugins-base/default.nix
+++ b/pkgs/development/libraries/gstreamer/gst-plugins-base/default.nix
@@ -8,14 +8,14 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "gst-plugins-base-0.10.36";
+  name = "gst-plugins-base-1.0.5";
 
   src = fetchurl {
     urls = [
       "${meta.homepage}/src/gst-plugins-base/${name}.tar.xz"
       "mirror://gentoo/distfiles/${name}.tar.xz"
       ];
-    sha256 = "0jp6hjlra98cnkal4n6bdmr577q8mcyp3c08s3a02c4hjhw5rr0z";
+    sha256 = "0wvigpblsarbxfv1ms34qza4yasqj18fwqf8268qgwwyp44nxkip";
   };
 
   patchPhase = ''
diff --git a/pkgs/development/libraries/gstreamer/gst-plugins-good/0.10.nix b/pkgs/development/libraries/gstreamer/gst-plugins-good/0.10.nix
new file mode 100644
index 0000000000000..2f009754d2296
--- /dev/null
+++ b/pkgs/development/libraries/gstreamer/gst-plugins-good/0.10.nix
@@ -0,0 +1,38 @@
+{ fetchurl, stdenv, pkgconfig, gst_plugins_base, aalib, cairo
+, flac, libjpeg, zlib, speex, libpng, libdv, libcaca
+, libiec61883, libavc1394, taglib, pulseaudio
+, glib, gstreamer, bzip2
+}:
+
+stdenv.mkDerivation rec {
+  name = "gst-plugins-good-0.10.31";
+
+  src = fetchurl {
+    urls = [
+      "${meta.homepage}/src/gst-plugins-good/${name}.tar.xz"
+      "mirror://gentoo/distfiles/${name}.tar.xz"
+      ];
+    sha256 = "0r1b54yixn8v2l1dlwmgpkr0v2a6a21id5njp9vgh58agim47a3p";
+  };
+
+  configureFlags = "--disable-oss";
+
+  buildInputs =
+    [ pkgconfig glib gstreamer gst_plugins_base libavc1394 libiec61883
+      aalib libcaca cairo libdv flac libjpeg libpng pulseaudio speex
+      taglib bzip2
+    ];
+
+  enableParallelBuilding = true;
+
+  meta = {
+    homepage = http://gstreamer.freedesktop.org;
+
+    description = "`Good' plug-ins for GStreamer";
+
+    maintainers = [stdenv.lib.maintainers.raskin];
+    platforms = stdenv.lib.platforms.linux;
+
+    license = "LGPLv2+";
+  };
+}
diff --git a/pkgs/development/libraries/gstreamer/gst-plugins-good/default.nix b/pkgs/development/libraries/gstreamer/gst-plugins-good/default.nix
index 4298a88f65e87..98f3a45de0064 100644
--- a/pkgs/development/libraries/gstreamer/gst-plugins-good/default.nix
+++ b/pkgs/development/libraries/gstreamer/gst-plugins-good/default.nix
@@ -5,14 +5,14 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "gst-plugins-good-0.10.30";
+  name = "gst-plugins-good-1.0.5";
 
   src = fetchurl {
     urls = [
-      "${meta.homepage}/src/gst-plugins-good/${name}.tar.bz2"
-      "mirror://gentoo/distfiles/${name}.tar.bz2"
+      "${meta.homepage}/src/gst-plugins-good/${name}.tar.xz"
+      "mirror://gentoo/distfiles/${name}.tar.xz"
       ];
-    sha256 = "1xlmw211fcn60y2m5gxrryb3knqril4kk2c01b6j713xna8blb5i";
+    sha256 = "1i8b2kap50pz5m3iq4hf23jjbx3cwn5lxjj84nrg35kqis20pgak";
   };
 
   configureFlags = "--disable-oss";
diff --git a/pkgs/development/libraries/gstreamer/gst-plugins-ugly/0.10.nix b/pkgs/development/libraries/gstreamer/gst-plugins-ugly/0.10.nix
new file mode 100644
index 0000000000000..e4fdf8e83a9f4
--- /dev/null
+++ b/pkgs/development/libraries/gstreamer/gst-plugins-ugly/0.10.nix
@@ -0,0 +1,30 @@
+{ fetchurl, stdenv, pkgconfig, glib, gstreamer, gst_plugins_base
+, libmad, libdvdread, libmpeg2, libcdio, a52dec }:
+
+stdenv.mkDerivation rec {
+  name = "gst-plugins-ugly-0.10.19";
+
+  src = fetchurl {
+    urls = [
+      "${meta.homepage}/src/gst-plugins-ugly/${name}.tar.xz"
+      "mirror://gentoo/distfiles/${name}.tar.xz"
+      ];
+    sha256 = "0wx8dr3sqfkar106yw6h57jdv2cifwsydkziz9z7wqwjz1gzcd29";
+  };
+
+  buildInputs =
+    [ pkgconfig glib gstreamer gst_plugins_base libmad libdvdread a52dec ];
+
+  enableParallelBuilding = true;
+
+  meta = {
+    homepage = http://gstreamer.freedesktop.org;
+
+    description = "‘Ugly’ (potentially patent-encumbered) plug-ins for GStreamer";
+
+    maintainers = [stdenv.lib.maintainers.raskin];
+    platforms = stdenv.lib.platforms.linux;
+
+    license = "LGPLv2+";
+  };
+}
diff --git a/pkgs/development/libraries/gstreamer/gst-plugins-ugly/default.nix b/pkgs/development/libraries/gstreamer/gst-plugins-ugly/default.nix
index b85fb983880b2..8ef88c24f5f3e 100644
--- a/pkgs/development/libraries/gstreamer/gst-plugins-ugly/default.nix
+++ b/pkgs/development/libraries/gstreamer/gst-plugins-ugly/default.nix
@@ -2,14 +2,14 @@
 , libmad, libdvdread, libmpeg2, libcdio, a52dec }:
 
 stdenv.mkDerivation rec {
-  name = "gst-plugins-ugly-0.10.18";
+  name = "gst-plugins-ugly-1.0.5";
 
   src = fetchurl {
     urls = [
-      "${meta.homepage}/src/gst-plugins-ugly/${name}.tar.bz2"
-      "mirror://gentoo/distfiles/${name}.tar.bz2"
+      "${meta.homepage}/src/gst-plugins-ugly/${name}.tar.xz"
+      "mirror://gentoo/distfiles/${name}.tar.xz"
       ];
-    sha256 = "054fdkb2riy5knda39cp6w3xp9lzax52bn12cklglscjrm46ghgr";
+    sha256 = "0c8kg59fg3v6hjf7wlwypcp9vnql359nvd4knj1jg6vdm4p1ham6";
   };
 
   buildInputs =
diff --git a/pkgs/development/libraries/gstreamer/gst-python/default.nix b/pkgs/development/libraries/gstreamer/gst-python/default.nix
deleted file mode 100644
index fedb44068eb8e..0000000000000
--- a/pkgs/development/libraries/gstreamer/gst-python/default.nix
+++ /dev/null
@@ -1,30 +0,0 @@
-{ fetchurl, stdenv, pkgconfig, python, gstreamer
-  , gst_plugins_base, pygtk
-}:
-
-stdenv.mkDerivation rec {
-  name = "gst-python-0.10.19";
-
-  src = fetchurl {
-    urls = [
-      "${meta.homepage}/src/gst-python/${name}.tar.bz2"
-      "mirror://gentoo/distfiles/${name}.tar.bz2"
-      ];
-    sha256 = "956f81a8c15daa3f17e688a0dc5a5d18a3118141066952d3b201a6ac0c52b415";
-  };
-
-  buildInputs =
-    [ pkgconfig gst_plugins_base pygtk ]
-    ;
-
-  propagatedBuildInputs = [ gstreamer python ];
- 
-  meta = {
-    homepage = http://gstreamer.freedesktop.org;
-
-    description = "Python bindings for GStreamer";
-
-    license = "LGPLv2+";
-  };
-}
-
diff --git a/pkgs/development/libraries/gstreamer/gstreamer/0.10.nix b/pkgs/development/libraries/gstreamer/gstreamer/0.10.nix
new file mode 100644
index 0000000000000..c3499801e6970
--- /dev/null
+++ b/pkgs/development/libraries/gstreamer/gstreamer/0.10.nix
@@ -0,0 +1,49 @@
+{ fetchurl, stdenv, perl, python, bison, flex, pkgconfig, glib, libxml2 }:
+
+stdenv.mkDerivation rec {
+  name = "gstreamer-0.10.36";
+
+  src = fetchurl {
+    urls =
+      [ "${meta.homepage}/src/gstreamer/${name}.tar.xz"
+        "mirror://gentoo/distfiles/${name}.tar.xz"
+      ];
+    sha256 = "1nkid1n2l3rrlmq5qrf5yy06grrkwjh3yxl5g0w58w0pih8allci";
+  };
+
+  buildInputs = [ perl python bison flex pkgconfig ];
+  propagatedBuildInputs = [ glib libxml2 ];
+
+  patchPhase = ''
+    sed -i -e 's/^   /\t/' docs/gst/Makefile.in docs/libs/Makefile.in docs/plugins/Makefile.in
+  '';
+
+  configureFlags = ''
+    --disable-examples --enable-failing-tests --localstatedir=/var --disable-gtk-doc --disable-docbook
+  '';
+
+  # Hm, apparently --disable-gtk-doc is ignored...
+  postInstall = "rm -rf $out/share/gtk-doc";
+
+  setupHook = ./setup-hook.sh;
+
+  meta = {
+    homepage = http://gstreamer.freedesktop.org;
+
+    description = "GStreamer, a library for constructing graphs of media-handling components";
+
+    longDescription = ''
+      GStreamer is a library for constructing graphs of media-handling
+      components.  The applications it supports range from simple
+      Ogg/Vorbis playback, audio/video streaming to complex audio
+      (mixing) and video (non-linear editing) processing.
+
+      Applications can take advantage of advances in codec and filter
+      technology transparently.  Developers can add new codecs and
+      filters by writing a simple plugin with a clean, generic
+      interface.
+    '';
+
+    license = "LGPLv2+";
+  };
+}
diff --git a/pkgs/development/libraries/gstreamer/gstreamer/default.nix b/pkgs/development/libraries/gstreamer/gstreamer/default.nix
index 5d33e7bff03d1..8db2461da0177 100644
--- a/pkgs/development/libraries/gstreamer/gstreamer/default.nix
+++ b/pkgs/development/libraries/gstreamer/gstreamer/default.nix
@@ -1,17 +1,17 @@
-{ fetchurl, stdenv, perl, bison, flex, pkgconfig, glib, libxml2 }:
+{ fetchurl, stdenv, perl, python, bison, flex, pkgconfig, glib, libxml2 }:
 
 stdenv.mkDerivation rec {
-  name = "gstreamer-0.10.36";
+  name = "gstreamer-1.0.5";
 
   src = fetchurl {
     urls =
       [ "${meta.homepage}/src/gstreamer/${name}.tar.xz"
         "mirror://gentoo/distfiles/${name}.tar.xz"
       ];
-    sha256 = "1nkid1n2l3rrlmq5qrf5yy06grrkwjh3yxl5g0w58w0pih8allci";
+    sha256 = "0xsvgi4axavrh0bkjr9h8yq75bmjjs37y7mwlg84d6phcxsq5hi6";
   };
 
-  buildInputs = [ perl bison flex pkgconfig ];
+  buildInputs = [ perl python bison flex pkgconfig ];
   propagatedBuildInputs = [ glib libxml2 ];
 
   patchPhase = ''
diff --git a/pkgs/development/libraries/gstreamer/gstreamer/setup-hook.sh b/pkgs/development/libraries/gstreamer/gstreamer/setup-hook.sh
index ad184dc21e990..e81a4ea1532f8 100644
--- a/pkgs/development/libraries/gstreamer/gstreamer/setup-hook.sh
+++ b/pkgs/development/libraries/gstreamer/gstreamer/setup-hook.sh
@@ -1,7 +1,8 @@
 addGstreamerLibPath () {
-    if test -d "$1/lib/gstreamer-0.10"
+    # 
+    if test -d "$1/lib/gstreamer-*"
     then
-        export GST_PLUGIN_PATH="${GST_PLUGIN_PATH}${GST_PLUGIN_PATH:+:}$1/lib/gstreamer-0.10"
+        export GST_PLUGIN_PATH="${GST_PLUGIN_PATH}${GST_PLUGIN_PATH:+:}$1/lib/gstreamer-*"
     fi
 }
 
diff --git a/pkgs/development/libraries/libav/default.nix b/pkgs/development/libraries/libav/default.nix
index 3fb1650bf46fe..649eff911527f 100644
--- a/pkgs/development/libraries/libav/default.nix
+++ b/pkgs/development/libraries/libav/default.nix
@@ -17,11 +17,11 @@ assert x264Support -> x264 != null;
 assert xvidSupport -> xvidcore != null;
 
 stdenv.mkDerivation rec {
-  name = "libav-0.7";
+  name = "libav-0.8.3";
   
   src = fetchurl {
     url = "http://libav.org/releases/${name}.tar.xz";
-    sha256 = "04pl6y53xh6xmwzz0f12mg5vh62ylp5zwwinj6dxzd8pnbjg4lsz";
+    sha256 = "37a9fc8bb5e56dcb0487afbb013f745a14addff61cea08a6009e2fd01251f080";
   };
 
   # `--enable-gpl' (as well as the `postproc' and `swscale') mean that
@@ -31,8 +31,8 @@ stdenv.mkDerivation rec {
     "--enable-gpl"
     "--enable-postproc"
     "--enable-swscale"
-    "--disable-ffserver"
-    "--disable-ffplay"
+    "--disable-avserver"
+    "--disable-avplay"
     "--enable-shared"
     "--enable-runtime-cpudetect"
   ]
diff --git a/pkgs/development/libraries/phonon-backend-gstreamer/default.nix b/pkgs/development/libraries/phonon-backend-gstreamer/default.nix
index b2677eb1e7a52..81b77fb70f868 100644
--- a/pkgs/development/libraries/phonon-backend-gstreamer/default.nix
+++ b/pkgs/development/libraries/phonon-backend-gstreamer/default.nix
@@ -2,7 +2,7 @@
 , gst_plugins_base }:
 
 let
-  version = "4.6.0";
+  version = "4.6.3";
   pname = "phonon-backend-gstreamer";
 in
 
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
 
   src = fetchurl {
     url = "mirror://kde/stable/phonon/${pname}/${version}/src/${name}.tar.xz";
-    sha256 = "0bwkd1dmj8p4m5xindh6ixfvifq36qmvfn246vx22syqfl6f1m2v";
+    sha256 = "0n5ggap1xzspq8x1j9bvnf7wqqh5495sysri7zyg42g32gqp7qjm";
   };
 
   buildInputs = [ phonon qt4 gstreamer gst_plugins_base ];
diff --git a/pkgs/development/libraries/telepathy/farstream/default.nix b/pkgs/development/libraries/telepathy/farstream/default.nix
index a183737dc9b22..e5791fc35605f 100644
--- a/pkgs/development/libraries/telepathy/farstream/default.nix
+++ b/pkgs/development/libraries/telepathy/farstream/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchurl, telepathy_glib, farstream, gst_plugins_base, dbus_glib
-, pkgconfig, libxslt, python, gstreamer, gst_python, pygobject }:
+, pkgconfig, libxslt, python, gstreamer, pygobject }:
 
 stdenv.mkDerivation rec {
   name = "${pname}-0.2.3";
@@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
     sha256 = "1a163gk9y3ckabm4a43lxc5a7j2s42hykbwr6r7b5mlfyqq8myx1";
   };
 
-  buildInputs = [ gst_plugins_base gst_python pygobject ];
+  buildInputs = [ gst_plugins_base pygobject ];
 
   propagatedBuildInputs = [ dbus_glib farstream telepathy_glib gstreamer ];
   buildNativeInputs = [ pkgconfig python libxslt];
diff --git a/pkgs/development/libraries/webkit/default.nix b/pkgs/development/libraries/webkit/default.nix
index d229228b94f79..0161766ea070c 100644
--- a/pkgs/development/libraries/webkit/default.nix
+++ b/pkgs/development/libraries/webkit/default.nix
@@ -18,7 +18,7 @@ rec {
     ];
 
   propagatedBuildInputs = [
-    gstreamer gst_plugins_base gst_ffmpeg gst_plugins_good
+    gstreamer gst_plugins_base gst_libav gst_plugins_good
     ];
 
   configureFlags = [
@@ -91,6 +91,6 @@ rec {
     maintainers = [stdenv.lib.maintainers.raskin];
   };
   passthru = {
-    inherit gstreamer gst_plugins_base gst_plugins_good gst_ffmpeg;
+    inherit gstreamer gst_plugins_base gst_plugins_good gst_libav;
   };
 }
diff --git a/pkgs/development/libraries/webkit/gtk2.nix b/pkgs/development/libraries/webkit/gtk2.nix
index 0b836cd08f002..9df8dcd12ae17 100644
--- a/pkgs/development/libraries/webkit/gtk2.nix
+++ b/pkgs/development/libraries/webkit/gtk2.nix
@@ -18,7 +18,7 @@ rec {
     ];
 
   propagatedBuildInputs = [
-    gstreamer gst_plugins_base gst_ffmpeg gst_plugins_good
+    gstreamer gst_plugins_base gst_libav gst_plugins_good
     ];
 
   configureFlags = [
@@ -87,6 +87,6 @@ rec {
     maintainers = [stdenv.lib.maintainers.raskin];
   };
   passthru = {
-    inherit gstreamer gst_plugins_base gst_plugins_good gst_ffmpeg;
+    inherit gstreamer gst_plugins_base gst_plugins_good gst_libav;
   };
 }
diff --git a/pkgs/development/libraries/webkit/svn.nix b/pkgs/development/libraries/webkit/svn.nix
index db6fe1ba55c87..8cbcee741b670 100644
--- a/pkgs/development/libraries/webkit/svn.nix
+++ b/pkgs/development/libraries/webkit/svn.nix
@@ -17,7 +17,7 @@ rec {
     ];
 
   propagatedBuildInputs = [
-    gstreamer gst_plugins_base gst_ffmpeg gst_plugins_good
+    gstreamer gst_plugins_base gst_libav gst_plugins_good
     ];
 
   configureCommand = "./autogen.sh ";
@@ -86,6 +86,6 @@ rec {
     maintainers = [stdenv.lib.maintainers.raskin];
   };
   passthru = {
-    inherit gstreamer gst_plugins_base gst_plugins_good gst_ffmpeg;
+    inherit gstreamer gst_plugins_base gst_plugins_good gst_libav;
   };
 }
diff --git a/pkgs/development/python-modules/pygobject/default.nix b/pkgs/development/python-modules/pygobject/default.nix
index 5575243bd9f3d..d7d2733e7f073 100644
--- a/pkgs/development/python-modules/pygobject/default.nix
+++ b/pkgs/development/python-modules/pygobject/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, python, pkgconfig, glib }:
 
 stdenv.mkDerivation rec {
-  name = "pygobject-2.27.0";
+  name = "pygobject-3.0.4";
   
   src = fetchurl {
-    url = "http://ftp.gnome.org/pub/GNOME/sources/pygobject/2.27/${name}.tar.bz2";
-    sha256 = "18mq4mj9s9sw12m6gbbc4iffrq993c7q09v9yahlnamrqn3bv53m";
+    url = "http://ftp.gnome.org/pub/GNOME/sources/pygobject/3.0/${name}.tar.xz";
+    sha256 = "f457b1d7f6b8bfa727593c3696d2b405da66b4a8d34cd7d3362ebda1221f0661";
   };
 
   configureFlags = "--disable-introspection";
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index bfab97ff543ed..ee8293cc3c576 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3889,27 +3889,44 @@ let
   mpfr = callPackage ../development/libraries/mpfr { };
 
   gst_all = {
-    inherit (pkgs) gstreamer gnonlin gst_python qt_gstreamer;
+    inherit (pkgs) gstreamer gnonlin qt_gstreamer;
     gstPluginsBase = pkgs.gst_plugins_base;
     gstPluginsBad = pkgs.gst_plugins_bad;
     gstPluginsGood = pkgs.gst_plugins_good;
     gstPluginsUgly = pkgs.gst_plugins_ugly;
-    gstFfmpeg = pkgs.gst_ffmpeg;
+    gstLibAV = pkgs.gst_libav;
   };
 
   gstreamer = callPackage ../development/libraries/gstreamer/gstreamer {};
+  gstreamer_0_10 = callPackage ../development/libraries/gstreamer/gstreamer/0.10.nix {};
 
   gst_plugins_base = callPackage ../development/libraries/gstreamer/gst-plugins-base {};
+  gst_plugins_base_0_10 = callPackage ../development/libraries/gstreamer/gst-plugins-base/0.10.nix {
+    gstreamer = gstreamer_0_10;
+  };
 
   gst_plugins_good = callPackage ../development/libraries/gstreamer/gst-plugins-good {};
+  gst_plugins_good_0_10 = callPackage ../development/libraries/gstreamer/gst-plugins-good/0.10.nix {
+    gstreamer = gstreamer_0_10;
+    gst_plugins_base = gst_plugins_base_0_10;
+  };
 
   gst_plugins_bad = callPackage ../development/libraries/gstreamer/gst-plugins-bad {};
+  gst_plugins_bad_0_10 = callPackage ../development/libraries/gstreamer/gst-plugins-bad/0.10.nix {
+    gstreamer = gstreamer_0_10;
+    gst_plugins_base = gst_plugins_base_0_10;
+  };
 
   gst_plugins_ugly = callPackage ../development/libraries/gstreamer/gst-plugins-ugly {};
+  gst_plugins_ugly_0_10 = callPackage ../development/libraries/gstreamer/gst-plugins-ugly/0.10.nix {
+    gstreamer = gstreamer_0_10;
+    gst_plugins_base = gst_plugins_base_0_10;
+  };
 
-  gst_ffmpeg = callPackage ../development/libraries/gstreamer/gst-ffmpeg {};
-
-  gst_python = callPackage ../development/libraries/gstreamer/gst-python {};
+  gst_libav = callPackage ../development/libraries/gstreamer/gst-libav {};
+  gst_ffmpeg_0_10 = callPackage ../development/libraries/gstreamer/gst-ffmpeg/0.10.nix {  # gst_ffmpeg was renamed to gst_libav with gstreamer 1.0
+    gst_plugins_base = gst_plugins_base_0_10;
+  };
 
   gnonlin = callPackage ../development/libraries/gstreamer/gnonlin {};
 
@@ -4795,7 +4812,10 @@ let
 
   phonon = callPackage ../development/libraries/phonon { };
 
-  phonon_backend_gstreamer = callPackage ../development/libraries/phonon-backend-gstreamer { };
+  phonon_backend_gstreamer = callPackage ../development/libraries/phonon-backend-gstreamer { 
+    gstreamer = gstreamer_0_10;
+    gst_plugins_base = gst_plugins_base_0_10;
+  };
 
   phonon_backend_vlc = callPackage ../development/libraries/phonon-backend-vlc { };
 
@@ -5118,7 +5138,7 @@ let
         icu cairo intltool automake libtool
         pkgconfig autoconf bison libproxy enchant
         python ruby which flex geoclue mesa;
-      inherit gstreamer gst_plugins_base gst_ffmpeg
+      inherit gstreamer gst_plugins_base gst_libav
         gst_plugins_good;
       inherit (xlibs) libXt renderproto libXrender kbproto;
       libpng = libpng12;
@@ -5134,7 +5154,7 @@ let
         icu cairo intltool automake libtool
         pkgconfig autoconf bison libproxy enchant
         python ruby which flex geoclue;
-      inherit gstreamer gst_plugins_base gst_ffmpeg
+      inherit gstreamer gst_plugins_base gst_libav
         gst_plugins_good;
       inherit (xlibs) libXt renderproto libXrender;
       libpng = libpng12;
@@ -5150,7 +5170,7 @@ let
         icu cairo perl intltool automake libtool
         pkgconfig autoconf bison libproxy enchant
         python ruby which flex geoclue;
-      inherit gstreamer gst_plugins_base gst_ffmpeg
+      inherit gstreamer gst_plugins_base gst_libav
         gst_plugins_good;
       inherit (xlibs) libXt renderproto libXrender;
       libpng = libpng12;
@@ -7929,6 +7949,8 @@ let
     wrapPython = pythonPackages.wrapPython;
   };
 
+  transmageddon = callPackage ../applications/video/transmageddon { };
+
   transmission = callPackage ../applications/networking/p2p/transmission { };
 
   transmission_remote_gtk = callPackage ../applications/networking/p2p/transmission-remote-gtk {};
@@ -8909,7 +8931,7 @@ let
   gajim = builderDefsPackage (import ../applications/networking/instant-messengers/gajim) {
     inherit perl intltool pyGtkGlade gettext pkgconfig makeWrapper pygobject
       pyopenssl gtkspell libsexy pycrypto aspell pythonDBus pythonSexy
-      docutils gtk farstream gst_plugins_bad gstreamer gst_ffmpeg gst_python;
+      docutils gtk farstream gst_plugins_bad gstreamer gst_libav;
     dbus = dbus.libs;
     inherit (gnome) libglade;
     inherit (xlibs) libXScrnSaver libXt xproto libXext xextproto libX11
diff --git a/pkgs/top-level/release-python.nix b/pkgs/top-level/release-python.nix
index 24bb64cb8f8aa..2570ba4cf0609 100644
--- a/pkgs/top-level/release-python.nix
+++ b/pkgs/top-level/release-python.nix
@@ -549,7 +549,7 @@ in
   gsettings_desktop_schemas = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; };
   gsmartcontrol = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; };
   gssdp = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; };
-  gst_ffmpeg = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; };
+  gst_libav = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; };
   gst_plugins_bad = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; };
   gst_plugins_base = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; };
   gst_plugins_good = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; };