diff --git a/pkgs/misc/tex/texlive/aggregate.nix b/pkgs/misc/tex/texlive/aggregate.nix
index 0ece514c6fb8..887b45e0d55f 100644
--- a/pkgs/misc/tex/texlive/aggregate.nix
+++ b/pkgs/misc/tex/texlive/aggregate.nix
@@ -9,7 +9,7 @@ rec {
 
     for currentPath in ${lib.concatStringsSep " " buildInputs}; do
         echo Symlinking "$currentPath"
-        find $currentPath/share ! -type d | while read; do
+        find $currentPath/share/info $currentPath/share/man $(echo $currentPath/texmf*) ! -type d | while read; do
             REPLY="''${REPLY#$currentPath}"
 	    ensureDir $out/"$(dirname "$REPLY")"
 	    ln -fs $currentPath/"$REPLY" $out/"$REPLY"
@@ -20,10 +20,12 @@ rec {
 	cp -Trfp $currentPath/libexec $out/libexec || true
     done
 
-    rm -r $out/share/texmf-config
-    find $out/share/texmf -type d | while read; do
-      REPLY="''${REPLY#$out/share/texmf}"
-      ensureDir $out/share/texmf-config/"$REPLY"
+    ln -s $out/texmf* $out/share/
+
+    rm -r $out/texmf-config
+    find $out/texmf/ -type d | while read; do
+      REPLY="''${REPLY#$out/texmf}"
+      ensureDir $out/texmf-config/"$REPLY"
     done
 
     ensureDir $out/bin
@@ -32,15 +34,15 @@ rec {
         chmod a+x $out/bin/$(basename $i)
     done
 
-    rm $out/share/texmf*/ls-R
+    rm $out/texmf*/ls-R
     for i in web2c texconfig fonts/map; do
-        cp -r $out/share/texmf/$i/* $out/share/texmf-config/$i || true
+        cp -r $out/texmf/$i/* $out/texmf-config/$i || true
     done
 
-    TEXMFCONFIG=$out/share/texmf-config HOME=$PWD PATH=$PATH:$out/bin updmap --syncwithtrees
-    PATH=$PATH:$out/bin mktexlsr $out/share/texmf*
-    TEXMFCONFIG=$out/share/texmf-config HOME=$PWD PATH=$PATH:$out/bin updmap --syncwithtrees
-    PATH=$PATH:$out/bin mktexlsr $out/share/texmf*
+    TEXMFCONFIG=$out/texmf-config HOME=$PWD PATH=$PATH:$out/bin updmap --syncwithtrees
+    PATH=$PATH:$out/bin mktexlsr $out/texmf*
+    TEXMFCONFIG=$out/texmf-config HOME=$PWD PATH=$PATH:$out/bin updmap --syncwithtrees
+    PATH=$PATH:$out/bin mktexlsr $out/texmf*
   '') ["minInit" "defEnsureDir" "addInputs"];
 
   meta = {
diff --git a/pkgs/misc/tex/texlive/cm-super.nix b/pkgs/misc/tex/texlive/cm-super.nix
index a147d6917430..6c656d852327 100644
--- a/pkgs/misc/tex/texlive/cm-super.nix
+++ b/pkgs/misc/tex/texlive/cm-super.nix
@@ -1,9 +1,9 @@
 args: with args;
 rec {
-  name = "texlive-cm-super-2007";
+  name = "texlive-cm-super-2009";
   src = fetchurl {
-    url = mirror://debian/pool/main/c/cm-super/cm-super_0.3.3.orig.tar.gz;
-    sha256 = "1lxvnhqds2zi6ssz66r1b7s6p855lab7cgp0hdg247zkacbjxcfg";
+    url = mirror://debian/pool/main/c/cm-super/cm-super_0.3.4.orig.tar.gz;
+    sha256 = "0zrq4sr9ank35svkz3cfd7f978i9c8xbzdqm2c8kvxia2753v082";
   };
 
   phaseNames = ["doCopy"];
@@ -18,10 +18,16 @@ rec {
     cp dvips/*.map  $out/share/texmf/fonts/map
     ensureDir $out/share/texmf/dvipdfm/config
     cp dvipdfm/*.map  $out/share/texmf/dvipdfm/config
+
+    ln -s $out/share/texmf* $out/
   '') ["minInit" "doUnpack" "defEnsureDir" "addInputs"];
   buildInputs = [texLive];
 
   meta = {
     description = "Extra components for TeXLive: CM-Super fonts";
+    maintainers = [ args.lib.maintainers.raskin ];
+
+    # Actually, arch-independent.. 
+    platforms = [] ;
   };
 }
diff --git a/pkgs/misc/tex/texlive/context.nix b/pkgs/misc/tex/texlive/context.nix
index e917cecf41e2..900726af2298 100644
--- a/pkgs/misc/tex/texlive/context.nix
+++ b/pkgs/misc/tex/texlive/context.nix
@@ -1,9 +1,9 @@
 args: with args;
 rec {
-  name = "context-2008.01.28";
+  name = "context-2009.11.26";
   src = fetchurl {
-    url = http://ftp.de.debian.org/debian/pool/main/c/context/context_2008.01.28.orig.tar.gz;
-    sha256 = "0infkn73v3kwqgg6b7rqnr28i5z5dbdfapy6ppzlcnr19yj4nh9y";
+    url = mirror://debian/pool/main/c/context/context_2009.11.26.orig.tar.gz;
+    sha256 = "1qv3h97cyhjyvivs30fz9bqr77j348azagm7ijiyfrclvjjlwav9";
   };
 
   buildInputs = [texLive];
diff --git a/pkgs/misc/tex/texlive/extra.nix b/pkgs/misc/tex/texlive/extra.nix
index 7ad4d9ad3e00..598bdd08aef5 100644
--- a/pkgs/misc/tex/texlive/extra.nix
+++ b/pkgs/misc/tex/texlive/extra.nix
@@ -1,19 +1,24 @@
 args: with args;
 rec {
-  name = "texlive-extra-2007";
+  name = "texlive-extra-2009";
   src = fetchurl {
-    url = mirror://debian/pool/main/t/texlive-extra/texlive-extra_2007.dfsg.17.orig.tar.gz;
-    sha256 = "093i40616vphyxycdi4z55sd2m0qfjypgprm7v182mgf55i2hpzc";
+    url = mirror://debian/pool/main/t/texlive-extra/texlive-extra_2009.orig.tar.gz;
+    sha256 = "04k48lxy76bad1270gb9k4aza2q13can2dbcf2hj0a3byls099kp";
   };
 
   buildInputs = [texLive];
   phaseNames = ["doCopy"];
   doCopy = fullDepEntry (''
     ensureDir $out/share
-    cp -r texmf* $out/share/
+    cp -r texmf* $out/
+    ln -s $out/texmf* $out/share
   '') ["minInit" "doUnpack" "defEnsureDir" "addInputs"];
 
   meta = {
     description = "Extra components for TeXLive";
+    maintainers = [ args.lib.maintainers.raskin ];
+
+    # Actually, arch-independent.. 
+    platforms = [] ;
   };
 }