diff --git a/pkgs/applications/video/kino/default.nix b/pkgs/applications/video/kino/default.nix
new file mode 100644
index 000000000000..8e501f40cc0e
--- /dev/null
+++ b/pkgs/applications/video/kino/default.nix
@@ -0,0 +1,90 @@
+# is this configure option of interest?
+#--enable-udev-rules-dir=PATH
+#                        Where to install udev rules (/etc/udev/rules.d)
+
+#TODO shared version?
+
+
+# This is my config output.. Much TODO ?
+#source path               /tmp/nix-31998-1/kino-1.2.0/ffmpeg
+#C compiler                gcc
+#make                      make
+#.align is power-of-two    no
+#ARCH                      x86_64 (generic)
+#build suffix              -kino
+#big-endian                no
+#MMX enabled               yes
+#CMOV enabled              no
+#CMOV is fast              no
+#gprof enabled             no
+#debug symbols             yes
+#strip symbols             yes
+#optimize                  yes
+#static                    yes
+#shared                    no
+#postprocessing support    no
+#software scaler enabled   yes
+#video hooking             no
+#network support           no
+#threading support         no
+#SDL support               no
+#Sun medialib support      no
+#AVISynth enabled          no
+#liba52 support            no
+#liba52 dlopened           no
+#libdts support            no
+#libfaac enabled           no
+#libfaad enabled           no
+#faadbin enabled           no
+#libgsm enabled            no
+#libmp3lame enabled        no
+#libnut enabled            no
+#libogg enabled            no
+#libtheora enabled         no
+#libvorbis enabled         no
+#x264 enabled              no
+#XviD enabled              no
+#zlib enabled              no
+#AMR-NB float support      no
+#AMR-NB fixed support      no
+#AMR-WB float support      no
+#AMR-WB IF2 support        no
+
+
+args:
+args.stdenv.mkDerivation {
+  name = "kino-1.2.0";
+
+  phases = "unpackPhase configurePhase buildPhase installPhase";
+
+  src = args.fetchurl {
+    url = http://downloads.sourceforge.net/kino/kino-1.2.0.tar.gz;
+    sha256 = "15q1qmii5a2zbrrrg8iba2d1rjzaisa75zvxjhrs86jwglpn4lp9";
+  };
+
+  buildInputs =(with args; [ gtk libglade libxml2 libraw1394 libsamplerate libdv 
+      pkgconfig perl perlXMLParser libavc1394 libiec61883 x11 libXv gettext libX11 glib cairo ]); # TODOoptional packages 
+
+  #preConfigure = "
+  #  grep 11 env-vars
+  #  ex
+  #";
+
+  postInstall = "
+    rpath=`patchelf --print-rpath \$out/bin/kino`;
+    for i in $\buildInputs; do
+      echo adding \$i/lib
+      rpath=\$rpath\${rpath:+:}\$i/lib
+    done
+    for i in \$out/bin/*; do
+      patchelf --set-rpath \"\$rpath\" \"\$i\"
+    done
+  ";
+
+
+  meta = { 
+      description = "Kino is a non-linear DV editor for GNU/Linux";
+      homepage = http://www.kinodv.org/;
+      license = "GPL2";
+  };
+}
diff --git a/pkgs/desktops/gnome/default.nix b/pkgs/desktops/gnome/default.nix
index 9b4c14340bfc..a3f8d4a9c052 100644
--- a/pkgs/desktops/gnome/default.nix
+++ b/pkgs/desktops/gnome/default.nix
@@ -153,7 +153,7 @@ rec {
   };
 
   gtksourceview = import ./gtksourceview.nix {
-    inherit fetchurl stdenv pkgconfig perl perlXMLParser gtk libxml2
+    inherit fetchurl stdenv pkgconfig perl perlXMLParser gtk libxml2 gettext
             libgnomeprint gnomevfs libbonobo /* !!! <- should be propagated in gnomevfs */
             GConf /* idem */ libgnomeprintui libgnomecanvas /* !!! through printui */;
     input = desktop.gtksourceview;
diff --git a/pkgs/desktops/gnome/gtksourceview.nix b/pkgs/desktops/gnome/gtksourceview.nix
index 8ad7955e8d40..8afafac8cf46 100644
--- a/pkgs/desktops/gnome/gtksourceview.nix
+++ b/pkgs/desktops/gnome/gtksourceview.nix
@@ -1,6 +1,7 @@
 { input, stdenv, fetchurl, perl, perlXMLParser, pkgconfig
 , gtk, libxml2, libgnomeprint, gnomevfs, libbonobo, GConf
 , libgnomeprintui, libgnomecanvas
+, gettext
 }:
 
 stdenv.mkDerivation {
@@ -8,6 +9,7 @@ stdenv.mkDerivation {
   buildInputs = [
     perl perlXMLParser pkgconfig gnomevfs
     libbonobo GConf libgnomeprintui libgnomecanvas
+    gettext
   ];
   propagatedBuildInputs = [gtk libxml2 libgnomeprint];
 }
diff --git a/pkgs/desktops/kde-4/base/default.nix b/pkgs/desktops/kde-4/base/default.nix
index 6013a507e3a4..4fff839769b5 100644
--- a/pkgs/desktops/kde-4/base/default.nix
+++ b/pkgs/desktops/kde-4/base/default.nix
@@ -1,11 +1,11 @@
 args: with args;
 
 stdenv.mkDerivation {
-  name = "kdebase-4.0rc2";
+  name = "kdebase-4.0.0";
 
   src = fetchurl {
-    url = mirror://kde/unstable/3.97/src/kdebase-3.97.0.tar.bz2;
-    sha256 = "1iavkzfq7f9308j2r70xd6qfng0fncpww8s49hbigzkkdzrjk8gn";
+    url = mirror://kde/stable/4.0/src/kdebase-4.0.0.tar.bz2;
+    sha256 = "1419zijcrx6nk10nay3dbv0vi8525hzcqkm2fw8cvw11i4mk909q";
   };
 
   propagatedBuildInputs = [kdepimlibs libusb];
diff --git a/pkgs/desktops/kde-4/edu/default.nix b/pkgs/desktops/kde-4/edu/default.nix
index 8e6b32c353a2..77fe86e21784 100644
--- a/pkgs/desktops/kde-4/edu/default.nix
+++ b/pkgs/desktops/kde-4/edu/default.nix
@@ -1,11 +1,11 @@
 args: with args;
 
 stdenv.mkDerivation rec {
-  name = "kdeedu-4.0rc2";
+  name = "kdeedu-4.0.0";
   
   src = fetchurl {
-    url = mirror://kde/unstable/3.97/src/kdeedu-3.97.0.tar.bz2;
-    sha256 = "1d2319pzs4ymbp2jgmc1kzkr5d9g5p5d1yg6b5l7z4b2qzhchpl4";
+    url = mirror://kde/stable/4.0/src/kdeedu-4.0.0.tar.bz2;
+    sha256 = "1wjy1rm7aiib1lv61wx7mcbkbpkk6phcz1q6dy51x0hfrc3rdkg4";
   };
 
   buildInputs = [kdelibs kdepimlibs boost readline openbabel ocaml
diff --git a/pkgs/desktops/kde-4/extragear/default.nix b/pkgs/desktops/kde-4/extragear/default.nix
index 69fc626db6d0..93e41c6fbfab 100644
--- a/pkgs/desktops/kde-4/extragear/default.nix
+++ b/pkgs/desktops/kde-4/extragear/default.nix
@@ -1,11 +1,11 @@
 args: with args;
 
 stdenv.mkDerivation {
-  name = "extragear-plasma-4.0rc2";
+  name = "extragear-plasma-4.0.0";
   
   src = fetchurl {
-    url = mirror://kde/unstable/3.97/src/extragear-plasma-3.97.0.tar.bz2;
-    sha256 = "1nzfy34ig66gfpgv6kbcmcap13axcy7kvj43srbd0ic6a0giv283";
+    url = mirror://kde/stable/4.0/src/extragear/extragear-plasma-4.0.0.tar.bz2;
+    sha256 = "19gmvqkal11gg67gfmdivxbhwvggm2i6ad642984d97yicms7s9k";
   };
 
   buildInputs = [ kdeworkspace kdebase ];
diff --git a/pkgs/desktops/kde-4/games/default.nix b/pkgs/desktops/kde-4/games/default.nix
index d82f3971e3cd..a8df422f2780 100644
--- a/pkgs/desktops/kde-4/games/default.nix
+++ b/pkgs/desktops/kde-4/games/default.nix
@@ -1,11 +1,11 @@
 args: with args;
 
 stdenv.mkDerivation {
-  name = "kdegames-4.0rc2";
+  name = "kdegames-4.0.0";
   
   src = fetchurl {
-    url = mirror://kde/unstable/3.97/src/kdegames-3.97.0.tar.bz2;
-    sha256 = "12a87lfaqlidjlibxk3q43bdza2c6k5ggqblxdnr8ikjdww2sk29";
+    url = mirror://kde/stable/4.0/src/kdegames-4.0.0.tar.bz2;
+    sha256 = "09ilgi6l5sq4gavskyhfrv8ra3n3r6xdn8cdc7fm2fi3zah4innn";
   };
 
   buildInputs = [kdelibs kdepimlibs];
diff --git a/pkgs/desktops/kde-4/graphics/default.nix b/pkgs/desktops/kde-4/graphics/default.nix
index b765e63108a6..18ff10255904 100644
--- a/pkgs/desktops/kde-4/graphics/default.nix
+++ b/pkgs/desktops/kde-4/graphics/default.nix
@@ -1,11 +1,11 @@
 args: with args;
 
 stdenv.mkDerivation {
-  name = "kdegraphics-4.0rc2";
+  name = "kdegraphics-4.0.0";
   
   src = fetchurl {
-    url = mirror://kde/unstable/3.97/src/kdegraphics-3.97.0.tar.bz2;
-    sha256 = "0f16zyvw37nqhbis34rg6yxg6r95yk2vi9lk3zk8lqjwcs81h5fz";
+    url = mirror://kde/stable/4.0/src/kdegraphics-4.0.0.tar.bz2;
+    sha256 = "00np19mzmg8zs8j89g1f47h3kj5azgnv3nspb8lw880zg682yp2f";
   };
 
   buildInputs = [kdelibs kdepimlibs libgphoto2 saneBackends
diff --git a/pkgs/desktops/kde-4/libs/default.nix b/pkgs/desktops/kde-4/libs/default.nix
index cd484fa444c2..b714977bd732 100644
--- a/pkgs/desktops/kde-4/libs/default.nix
+++ b/pkgs/desktops/kde-4/libs/default.nix
@@ -1,11 +1,11 @@
 args: with args;
 
 stdenv.mkDerivation rec {
-  name = "kdelibs-4.0rc2";
+  name = "kdelibs-4.0.0";
   
   src = fetchurl {
-    url = mirror://kde/unstable/3.97/src/kdelibs-3.97.0.tar.bz2;
-    sha256 = "0g9r7nph6hpdvbmchvp0h5xk4z0da0b5rskqpbixdplsdxcs8xhv";
+    url = mirror://kde/stable/4.0.0/src/kdelibs-4.0.0.tar.bz2;
+    sha256 = "0bfcrb34kl2md77k9rbr924n5bc7chc5wkr10jjvq98742yh0rza";
   };
 
   propagatedBuildInputs = [
diff --git a/pkgs/desktops/kde-4/multimedia/default.nix b/pkgs/desktops/kde-4/multimedia/default.nix
index feedc95b15b9..0570b6f40355 100644
--- a/pkgs/desktops/kde-4/multimedia/default.nix
+++ b/pkgs/desktops/kde-4/multimedia/default.nix
@@ -1,11 +1,11 @@
 args: with args;
 
 stdenv.mkDerivation {
-  name = "kdemultimedia-4.0rc2";
+  name = "kdemultimedia-4.0.0";
   
   src = fetchurl {
-    url = mirror://kde/unstable/3.97/src/kdemultimedia-3.97.0.tar.bz2;
-    sha256 = "0q78d1gh5na72aj604myy23qn6xb0izw0igsi1h9i4pc2bsis87i";
+    url = mirror://kde/stable/4.0/src/kdemultimedia-4.0.0.tar.bz2;
+    sha256 = "14axr1x09k67vb3vaw4g9zg4mq7j14xn9d90kifwap7b76iljbi5";
   };
 
   buildInputs = [kdelibs kdepimlibs kdeworkspace libogg flac cdparanoia lame
diff --git a/pkgs/desktops/kde-4/network/default.nix b/pkgs/desktops/kde-4/network/default.nix
index d962a9c40ea4..1a97c3e7e0dd 100644
--- a/pkgs/desktops/kde-4/network/default.nix
+++ b/pkgs/desktops/kde-4/network/default.nix
@@ -1,11 +1,11 @@
 args: with args;
 
 stdenv.mkDerivation {
-  name = "kdenetwork-4.0rc2";
+  name = "kdenetwork-4.0.0";
   
   src = fetchurl {
-    url = mirror://kde/unstable/3.97/src/kdenetwork-3.97.0.tar.bz2;
-    sha256 = "118r55aw0pag78kawjfn3vya7aca12n5ypknm1i4khxs747hxqbr";
+    url = mirror://kde/stable/4.0/src/kdenetwork-4.0.0.tar.bz2;
+    sha256 = "04vigr2z0md64khjdriwslsyaf6mpqxd2iwsnr82g53x4kh0i061";
   };
 
   buildInputs = [kdelibs kdepimlibs kdeworkspace sqlite libidn];
diff --git a/pkgs/desktops/kde-4/pim/default.nix b/pkgs/desktops/kde-4/pim/default.nix
index 397c57df5bf3..5a174130091e 100644
--- a/pkgs/desktops/kde-4/pim/default.nix
+++ b/pkgs/desktops/kde-4/pim/default.nix
@@ -1,11 +1,11 @@
 args: with args;
 
 stdenv.mkDerivation {
-  name = "kdepim-4.0rc2";
+  name = "kdepim-4.0.0";
   
   src = fetchurl {
-    url = mirror://kde/unstable/3.97/src/kdepim-3.97.0.tar.bz2;
-    sha256 = "1x5ywn1z963azrrm6rlsspzlsbbwxcsb3zc93pdy80qq1jwsf964";
+    url = mirror://kde/stable/4.0/src/kdepim-4.0.0.tar.bz2;
+    sha256 = "kdepim is not included";
   };
 
   buildInputs = [libXinerama mesa stdenv.gcc.libc alsaLib kdelibs kdepimlibs
diff --git a/pkgs/desktops/kde-4/pimlibs/default.nix b/pkgs/desktops/kde-4/pimlibs/default.nix
index 077cca5e32c9..1ea2e99615b1 100644
--- a/pkgs/desktops/kde-4/pimlibs/default.nix
+++ b/pkgs/desktops/kde-4/pimlibs/default.nix
@@ -1,11 +1,11 @@
 args: with args;
 
 stdenv.mkDerivation {
-  name = "kdepimlibs-4.0rc2";
+  name = "kdepimlibs-4.0.0";
   
   src = fetchurl {
-    url = mirror://kde/unstable/3.97/src/kdepimlibs-3.97.0.tar.bz2;
-	sha256 = "1zv4l592288bdfxqllm8z1cmsjcprfji5harcxf9hhz95igp5n7j";
+    url = mirror://kde/stable/4.0/src/kdepimlibs-4.0.0.tar.bz2;
+	sha256 = "0vixx2vh7qgysnbzvykf20362p22jzvl8snpqaknay3v3b2k0br0";
   };
 
   propagatedBuildInputs = [kdelibs boost gpgme cyrus_sasl openldap];
diff --git a/pkgs/desktops/kde-4/runtime/default.nix b/pkgs/desktops/kde-4/runtime/default.nix
index f1740f959fda..5a0d685c9bcd 100644
--- a/pkgs/desktops/kde-4/runtime/default.nix
+++ b/pkgs/desktops/kde-4/runtime/default.nix
@@ -1,11 +1,11 @@
 args: with args;
 
 stdenv.mkDerivation {
-  name = "kdebase-runtime-4.0rc2";
+  name = "kdebase-runtime-4.0.0";
   
   src = fetchurl {
-    url = mirror://kde/unstable/3.97/src/kdebase-runtime-3.97.0.tar.bz2;
-    sha256 = "16xang1sjj0h8339cfqf6l4qqswyv42sq9w9a3axmckklmfnx6b1";
+    url = mirror://kde/stable/4.0/src/kdebase-runtime-4.0.0.tar.bz2;
+    sha256 = "0svsn9gzg3ka77j7z71fy502a09w9gp9jd2q2y1w07ahpdil5p7h";
   };
 
   propagatedBuildInputs = [kdepimlibs libusb xineLib];
diff --git a/pkgs/desktops/kde-4/toys/default.nix b/pkgs/desktops/kde-4/toys/default.nix
index 1ebb427927d8..2c0fdb289592 100644
--- a/pkgs/desktops/kde-4/toys/default.nix
+++ b/pkgs/desktops/kde-4/toys/default.nix
@@ -1,11 +1,11 @@
 args: with args;
 
 stdenv.mkDerivation {
-  name = "kdetoys-4.0rc2";
+  name = "kdetoys-4.0.0";
   
   src = fetchurl {
-    url = mirror://kde/unstable/3.97/src/kdetoys-3.97.0.tar.bz2;
-    sha256 = "1ga2xlsr7wl7jnc4clzabgyv5wfcjgpfmv6ca99bkz31nr6lddpa";
+    url = mirror://kde/stable/4.0/src/kdetoys-4.0.0.tar.bz2;
+    sha256 = "0j7kk4ripg2sw4m8ym96aiyi8rsfb4p7kqp9kmik850flqighhsk";
   };
 
   buildInputs = [kdelibs kdepimlibs kdeworkspace];
diff --git a/pkgs/desktops/kde-4/utils/default.nix b/pkgs/desktops/kde-4/utils/default.nix
index fe453938c949..94f49d11efd5 100644
--- a/pkgs/desktops/kde-4/utils/default.nix
+++ b/pkgs/desktops/kde-4/utils/default.nix
@@ -1,11 +1,11 @@
 args: with args;
 
 stdenv.mkDerivation {
-  name = "kdeutils-4.0rc2";
+  name = "kdeutils-4.0.0";
   
   src = fetchurl {
-    url = mirror://kde/unstable/3.97/src/kdeutils-3.97.0.tar.bz2;
-    sha256 = "0nhs91xf83xyf4wlpppavrhyi76qdnilhaynwjirx5n85hjl4iiq";
+    url = mirror://kde/stable/4.0/src/kdeutils-4.0.0.tar.bz2;
+    sha256 = "0ha31z79ikkbknhyklihzys0w4jfz4qx8jiyja0gwh428f7mxqj4";
   };
 
   buildInputs = [kdelibs kdepimlibs kdeworkspace gmp libzip python ];
diff --git a/pkgs/desktops/kde-4/workspace/default.nix b/pkgs/desktops/kde-4/workspace/default.nix
index 162277a03ed6..a5929785aecd 100644
--- a/pkgs/desktops/kde-4/workspace/default.nix
+++ b/pkgs/desktops/kde-4/workspace/default.nix
@@ -1,12 +1,12 @@
 args: with args;
 
 stdenv.mkDerivation {
-  name = "kdebase-workspace-4.0rc2";
+  name = "kdebase-workspace-4.0.0";
   builder = ./builder.sh;
   
   src = fetchurl {
-    url = mirror://kde/unstable/3.97/src/kdebase-workspace-3.97.0.tar.bz2;
-    sha256 = "1sb3vm5y50af6qvsg4sjw14z7y4j1zbgp7w8gsffigbr0hyj4apl";
+    url = mirror://kde/stable/4.0/src/kdebase-workspace-4.0.0.tar.bz2;
+    sha256 = "08sgp7jaqljdxwsgr5lyyfd6w734yv24zswps1mchmhj01vz1fcg";
   };
 
   buildInputs = [kdelibs kdepimlibs stdenv.gcc.libc];
diff --git a/pkgs/development/compilers/ghc-6.8/default.nix b/pkgs/development/compilers/ghc-6.8/default.nix
index 929799d1521c..6226fa2988d7 100644
--- a/pkgs/development/compilers/ghc-6.8/default.nix
+++ b/pkgs/development/compilers/ghc-6.8/default.nix
@@ -29,6 +29,13 @@ stdenv.mkDerivation (rec {
     cat $setupHook  >> $out/nix-support/setup-hook
   '';
 
+  configureFlags=[
+    "--with-gmp-libraries=${gmp}/lib"
+    "--with-readline-libraries=${readline}/lib"
+    "--with-gmp-includes=${gmp}/include"
+    "--with-gcc=${gcc}/bin/gcc"
+  ];
+
   preConfigure = "
     # still requires a hack for ncurses
     sed -i \"s|^\\\(ld-options.*$\\\)|\\\1 -L${ncurses}/lib|\" libraries/readline/readline.buildinfo.in
diff --git a/pkgs/development/libraries/libavc1394/default.nix b/pkgs/development/libraries/libavc1394/default.nix
new file mode 100644
index 000000000000..3d1d63780c23
--- /dev/null
+++ b/pkgs/development/libraries/libavc1394/default.nix
@@ -0,0 +1,17 @@
+args:
+args.stdenv.mkDerivation {
+  name = "libavc1394-0.5.3";
+
+  src = args.fetchurl {
+    url = mirror://sourceforge/libavc1394/libavc1394-0.5.3.tar.gz;
+    sha256 = "19i40i3722ilhziknfds3a6w5xzv66fvc68gvbir1p2fvwi6ij93";
+  };
+
+  buildInputs =(with args; [pkgconfig libraw1394]);
+
+  meta = { 
+      description = "programming interface for the 1394 Trade Association AV/C (Audio/Video Control) Digital Interface Command Set";
+      homepage = http://sourceforge.net/projects/libavc1394/;
+      license = [ "GPL" "LGPL" ];
+  };
+}
diff --git a/pkgs/development/libraries/libiec61883/default.nix b/pkgs/development/libraries/libiec61883/default.nix
new file mode 100644
index 000000000000..3f167eb81de6
--- /dev/null
+++ b/pkgs/development/libraries/libiec61883/default.nix
@@ -0,0 +1,17 @@
+args:
+args.stdenv.mkDerivation {
+  name = "libiec61883-1.1.0";
+
+  src = args.fetchurl {
+    url = http://www.linux1394.org/dl/libiec61883-1.1.0.tar.gz;
+    sha256 = "09f0ca7bp6lqlz6601gnyl04mfabv0azg49n1cmjyqpzh35cgxkq";
+  };
+
+  buildInputs =(with args; [pkgconfig libraw1394]);
+
+  meta = { 
+      description = "TODO";
+      homepage = http://www.linux1394.org/;
+      license = "LGPL";
+    };
+}
diff --git a/pkgs/misc/emulators/wine/default.nix b/pkgs/misc/emulators/wine/default.nix
index fc9b97d5af9f..8a13c61b557c 100644
--- a/pkgs/misc/emulators/wine/default.nix
+++ b/pkgs/misc/emulators/wine/default.nix
@@ -7,11 +7,13 @@ assert stdenv.isLinux;
 let lib = import ../../../lib/default.nix; in
 
 stdenv.mkDerivation {
-  name = "wine-0.9.49";
+  name = "wine-0.9.53";
 
   src = fetchurl {
-		url = mirror://sourceforge/wine/wine-0.9.49.tar.bz2;
-		sha256 = "d41edd08cf7fd21d7350a633995107533a25f925c8859995d3a6fc131f54b3c1";
+		#url = mirror://sourceforge/wine/wine-0.9.49.tar.bz2;
+		url = mirror://sourceforge/wine/wine-0.9.53.tar.bz2;
+		#sha256 = "d41edd08cf7fd21d7350a633995107533a25f925c8859995d3a6fc131f54b3c1";
+		sha256 = "06317d78b7db39458656b6acc6b265ce97f358aefd7ded679263f397a89f1200";
 	};
 
   buildInputs = [
diff --git a/pkgs/os-specific/linux/firmware/iwlwifi-3945-ucode/default.nix b/pkgs/os-specific/linux/firmware/iwlwifi-3945-ucode/default.nix
new file mode 100644
index 000000000000..c17d29cafa40
--- /dev/null
+++ b/pkgs/os-specific/linux/firmware/iwlwifi-3945-ucode/default.nix
@@ -0,0 +1,19 @@
+{stdenv, fetchurl}:
+
+stdenv.mkDerivation {
+  name = "iwlwifi-3945-ucode-2.14.1.5";
+  
+  src = fetchurl {
+    url = http://intellinuxwireless.org/iwlwifi/downloads/iwlwifi-3945-ucode-2.14.1.5.tgz;
+    sha256 = "06gy21qkd4kj6pf3nsz5z3xkgmcafzrm1krywd8lbb8i56i3jkra";
+  };
+  
+  buildPhase = "true";
+
+  installPhase = "ensureDir $out; chmod -x *; cp * $out";
+  
+  meta = {
+    description = "Firmware for the Intel 3945ABG wireless card";
+    homepage = http://intellinuxwireless.org/;
+  };
+}
diff --git a/pkgs/os-specific/linux/iwlwifi/default.nix b/pkgs/os-specific/linux/iwlwifi/default.nix
new file mode 100644
index 000000000000..8859f7346b51
--- /dev/null
+++ b/pkgs/os-specific/linux/iwlwifi/default.nix
@@ -0,0 +1,37 @@
+{stdenv, fetchurl, kernel}:
+
+stdenv.mkDerivation {
+  name = "iwlwifi-1.2.23";
+
+  src = fetchurl {
+    url = http://www.intellinuxwireless.org/iwlwifi/downloads/iwlwifi-1.2.23.tgz;
+    sha256 = "0a4szjgg5b2jj4ax85lakqa951ph6pw5wpwlrw3mnmvcda5ayiip";
+  };
+
+  preBuild = ''
+    substituteInPlace scripts/generate_compatible \
+      --replace '/usr/bin/env /bin/bash' $shell
+    substituteInPlace Makefile \
+      --replace /sbin/depmod true
+
+    # Urgh, we need the complete kernel sources for some header
+    # files.  So unpack the original kernel source tarball and copy
+    # the configured include directory etc. on top of it.
+    kernelVersion=$(cd ${kernel}/lib/modules && ls)
+    kernelBuild=$(echo ${kernel}/lib/modules/$kernelVersion/source)
+    tar xvfj ${kernel.src}
+    kernelSource=$(echo $(pwd)/linux-*)
+    cp -prd $kernelBuild/* $kernelSource
+
+    makeFlags=KSRC=$kernelSource
+    make $makeFlags || true
+    make $makeFlags
+
+    installFlags=KMISC=$out/lib/modules/$kernelVersion/misc
+  ''; # */
+
+  meta = {
+    description = "Intel Wireless WiFi Link drivers for Linux";
+    homepage = http://www.intellinuxwireless.org/;
+  };
+}
diff --git a/pkgs/os-specific/linux/module-init-tools/aggregator.nix b/pkgs/os-specific/linux/module-init-tools/aggregator.nix
index 09866f414e5d..cfd49cc0813f 100644
--- a/pkgs/os-specific/linux/module-init-tools/aggregator.nix
+++ b/pkgs/os-specific/linux/module-init-tools/aggregator.nix
@@ -2,32 +2,34 @@ args : with args;
 	with builderDefs {
 		addSbinPath = true;
 		src = "";
-		buildInputs = [lndir module_init_tools];
+		buildInputs = [module_init_tools];
 		configureFlags = [];
 	} null; /* null is a terminator for sumArgs */
 let 
 
 doCollect = FullDepEntry (''
-ensureDir $out/
+ensureDir $out/lib/modules
 cd $out/
 for i in $moduleSources; do 
-	lndir $i/
+	cp -rfs $i/* .
+	chmod -R u+w .
 done
 rm -rf nix-support
 cd lib/modules/
 rm */modules.*
 MODULE_DIR=$PWD/ depmod -a 
+cd $out/
 '') [minInit addInputs defEnsureDir];
 in
 stdenv.mkDerivation rec {
-	name = "module-aggregator";
+	name = "kernel-modules";
 	inherit moduleSources;
 	builder = writeScript (name + "-builder")
 		(textClosure [doCollect doForceShare doPropagate]);
 	meta = {
 		description = "
 		A directory to hold all  the modules, including those 
-		built separately from kernel. Earlier directories in 
+		built separately from kernel. Later mentioned directories in 
 		moduleSources have higher priority.
 ";
 	};
diff --git a/pkgs/os-specific/linux/ndiswrapper/default.nix b/pkgs/os-specific/linux/ndiswrapper/default.nix
index 5138ae4f9b8f..1eed97d7c515 100644
--- a/pkgs/os-specific/linux/ndiswrapper/default.nix
+++ b/pkgs/os-specific/linux/ndiswrapper/default.nix
@@ -10,7 +10,7 @@ stdenv.mkDerivation {
   ";
 
   # should we use unstable? 
-  src = args.fetchurl {
+  src = fetchurl {
     url = http://kent.dl.sourceforge.net/sourceforge/ndiswrapper/ndiswrapper-1.49.tar.gz;
     sha256 = "1b9nqkk7gv6gffzj9b8mjy5myxf2afwpyr2n5wbfsylf15dvvvjr";
   };
diff --git a/pkgs/os-specific/linux/nvidia/builder.sh b/pkgs/os-specific/linux/nvidia/builder.sh
index 4ef8c551d1c8..00d70d6198f2 100755
--- a/pkgs/os-specific/linux/nvidia/builder.sh
+++ b/pkgs/os-specific/linux/nvidia/builder.sh
@@ -20,7 +20,8 @@ myBuildPhase() {
     #patch -p1 < $xenPatch
 
     # Create the module.
-    sysSrc=$(echo $kernel/lib/modules/2.*/build/)
+    kernelVersion=$(cd $kernel/lib/modules && ls)
+    sysSrc=$(echo $kernel/lib/modules/$kernelVersion/build/)
     unset src # used by the nv makefile
     make SYSSRC=$sysSrc module
     cd ../../..
@@ -31,8 +32,8 @@ installPhase=myInstallPhase
 myInstallPhase() {
 
     # Install the kernel module.
-    ensureDir $out/lib
-    cp usr/src/nv/nvidia.ko $out/lib/
+    ensureDir $out/lib/modules/$kernelVersion/misc
+    cp usr/src/nv/nvidia.ko $out/lib/modules/$kernelVersion/misc
 
     # Install libGL and friends.
     cp -prd usr/lib/* usr/X11R6/lib/libXv* $out/lib/
diff --git a/pkgs/os-specific/linux/wpa_supplicant/default.nix b/pkgs/os-specific/linux/wpa_supplicant/default.nix
index cf529b04637e..f58a360ac8d8 100644
--- a/pkgs/os-specific/linux/wpa_supplicant/default.nix
+++ b/pkgs/os-specific/linux/wpa_supplicant/default.nix
@@ -1,11 +1,11 @@
 {stdenv, fetchurl, openssl}:
 
 stdenv.mkDerivation {
-  name = "wpa_supplicant-0.5.8";
+  name = "wpa_supplicant-0.5.9";
 
   src = fetchurl {
-    url = http://hostap.epitest.fi/releases/wpa_supplicant-0.5.8.tar.gz;
-    sha256 = "1w37bm42gh1k0v3r8cdmyrvf5rk5fyz9bvsp10w2cvgrwgi5b5rg";
+    url = http://hostap.epitest.fi/releases/wpa_supplicant-0.5.9.tar.gz;
+    sha256 = "1dylaiikp2jb13jbxdrl1h9b9p2lkjmzx06hpmkcpyq5c5g7p0xy";
   };
 
   preBuild = "
diff --git a/pkgs/servers/samba/default.nix b/pkgs/servers/samba/default.nix
index b46f6494c165..e94c2d1c5547 100644
--- a/pkgs/servers/samba/default.nix
+++ b/pkgs/servers/samba/default.nix
@@ -9,6 +9,9 @@ stdenv.mkDerivation {
   };
 
   buildInputs = [readline pam openldap];
-  configureFlags = "--with-pam --with-smbmount";
+  configureFlags = [" --with-pam " " --with-smbmount " 
+  	" --datadir=\$out/share " " --with-acl-support "
+	" --with-aio-support "];
   postUnpack = "sourceRoot=\$sourceRoot/source";
+  postInstall = "rm -rf \$out/var ; ln -s /var/samba $out/var ";
 }
diff --git a/pkgs/tools/misc/relfs/cvs.2007.12.01.nix b/pkgs/tools/misc/relfs/cvs.2007.12.01.nix
index 411906e45ba2..cffa01b9b95f 100644
--- a/pkgs/tools/misc/relfs/cvs.2007.12.01.nix
+++ b/pkgs/tools/misc/relfs/cvs.2007.12.01.nix
@@ -25,15 +25,15 @@ let build = FullDepEntry ("
 	echo '
 		createuser -A -D \$1
 		dropdb relfs_\$1 ;
-		rm -rf /tmp/relfs-\$1-tmp;  
-		mkdir /tmp/relfs-\$1-tmp;  
-		USER=\$1 relfs -f -s /tmp/relfs-raskin-tmp  & 
-		sleep 1 && 
+		rm -rf /tmp/relfs-\$1-tmp;
+		mkdir /tmp/relfs-\$1-tmp;
+		USER=\$1 relfs -f -s /tmp/relfs-raskin-tmp  &
+		sleep 1 &&
 		kill -15 \${!};
-		rm -rf /tmp/relfs-\$1-tmp ; 
-		psql -d relfs_\$1 <<< \"ALTER DATABASE relfs_raskin OWNER TO raskin; 
-			ALTER TABLE obj OWNER TO \$1; 
-			ALTER TABLE obj_mimetype OWNER TO \$1; 
+		rm -rf /tmp/relfs-\$1-tmp ;
+		psql -d relfs_\$1 <<< \"ALTER DATABASE relfs_raskin OWNER TO raskin;
+			ALTER TABLE obj OWNER TO \$1;
+			ALTER TABLE obj_mimetype OWNER TO \$1;
 			ALTER TABLE membership OWNER TO \$1;\"' > \$out/bin/relfs_grant;
 	chmod a+x \$out/bin/relfs_grant;
 ") [minInit doUnpack addInputs];
diff --git a/pkgs/tools/security/chkrootkit/default.nix b/pkgs/tools/security/chkrootkit/default.nix
new file mode 100644
index 000000000000..e7545ac8cd6a
--- /dev/null
+++ b/pkgs/tools/security/chkrootkit/default.nix
@@ -0,0 +1,16 @@
+{stdenv, fetchurl}:
+  
+stdenv.mkDerivation {
+  name = "chkrootkit-0.48";
+  
+  src = fetchurl {
+    url = ftp://ftp.pangeia.com.br/pub/seg/pac/chkrootkit.tar.gz;
+    sha256 = "1yzid6bw092nf8k83y1119kc4ns7r0l3zsfah5xal8kh19ad7cxl";
+  };
+
+  installPhase = "
+    ensureDir $out/sbin
+    cp check_wtmpx chkdirs chklastlog chkproc chkrootkit chkutmp chkwtmp ifpromisc strings-static $out/sbin
+  ";
+  
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 10bf6ee2323e..4e8de1db2faa 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -295,11 +295,11 @@ rec {
   writeText = name: text: runCommand name {inherit text;} "echo -n \"$text\" > $out";
 
   writeScript = name: text: runCommand name {inherit text;} "echo -n \"$text\" > $out; chmod +x $out";
-
-  stdenvNewSetupScript = stdenv;
  
   writeScriptBin = name: text: runCommand name {inherit text;} "mkdir -p \$out/bin; echo -n \"\$text\" > \$out/bin/\$name ; chmod +x \$out/bin/\$name";
 
+  stdenvNewSetupScript = stdenv;
+
   substituteAll = import ../build-support/substitute/substitute-all.nix {
     inherit stdenv;
   };
@@ -358,6 +358,10 @@ rec {
     inherit fetchurl stdenv;
   };
 
+  chkrootkit = import ../tools/security/chkrootkit {
+    inherit fetchurl stdenv;
+  };
+
   cksfv = import ../tools/networking/cksfv {
     inherit fetchurl stdenv;
   };
@@ -1990,6 +1994,10 @@ rec {
     inherit (xlibs) libXp libXau;
   };
 
+  libavc1394 = import ../development/libraries/libavc1394 {
+    inherit fetchurl stdenv pkgconfig libraw1394;
+  };
+
   libcaca = import ../development/libraries/libcaca {
     inherit fetchurl stdenv ncurses;
   };
@@ -2089,6 +2097,10 @@ rec {
 	  inherit fetchurl stdenv;
   };
 
+  libiec61883 = import ../development/libraries/libiec61883 {
+    inherit fetchurl stdenv pkgconfig libraw1394;
+  };
+
   libjpeg = import ../development/libraries/libjpeg {
     inherit fetchurl stdenv libtool;
   };
@@ -3091,6 +3103,14 @@ rec {
     inherit fetchurl stdenv;
   };
 
+  iwlwifi = import ../os-specific/linux/iwlwifi {
+    inherit fetchurl stdenv kernel;
+  };
+
+  iwlwifi3945ucode = import ../os-specific/linux/firmware/iwlwifi-3945-ucode {
+    inherit fetchurl stdenv;
+  };
+
   kbd = import ../os-specific/linux/kbd {
     inherit fetchurl stdenv bison flex;
   };
@@ -3139,6 +3159,16 @@ rec {
 	configFile = getConfig ["kernel" "configFile"] null;
   };
 
+  kqemuFun = lib.sumArgs (selectVersion ../os-specific/linux/kqemu) {
+    inherit fetchurl stdenv builderDefs;
+  };
+
+  # No finished expression is provided - pick your own kernel
+  kqemuFunCurrent = theKernel:  (kqemuFun { 
+    version = "1.3.0pre11";
+    kernel = theKernel;
+  } null);
+
   libselinux = import ../os-specific/linux/libselinux {
     inherit fetchurl stdenv libsepol;
   };
@@ -3147,7 +3177,6 @@ rec {
     inherit fetchurl stdenv;
   };
 
- 
   libsexy = import ../development/libraries/libsexy {
     inherit stdenv fetchurl pkgconfig libxml2;
     inherit (gtkLibs) glib gtk pango;
@@ -3239,9 +3268,7 @@ rec {
 
   module_aggregation = moduleSources:  
   import ../os-specific/linux/module-init-tools/aggregator.nix {
-    inherit fetchurl stdenv module_init_tools moduleSources 
-      builderDefs;
-    inherit (xorg) lndir;
+    inherit fetchurl stdenv module_init_tools moduleSources builderDefs;
   };
 
   modutils = import ../os-specific/linux/modutils {
@@ -3979,6 +4006,18 @@ rec {
     inherit stdenv fetchurl;
   };
 
+  kino = import ../applications/video/kino {
+    inherit fetchurl pkgconfig libxml2 perl perlXMLParser stdenv
+      libdv libraw1394 libavc1394 libiec61883 x11 gettext cairo; /* libavformat */
+    inherit libsamplerate ffmpeg;
+    inherit (gnome) libglade gtk glib;
+    inherit (xlibs) libXv libX11;
+    inherit (gtkLibs) pango;
+
+  # #  optional
+  #  inherit ffmpeg2theora sox, vorbis-tools lame mjpegtools dvdauthor 'Q'dvdauthor growisofs mencoder;
+  };
+
   kuickshow = import ../applications/graphics/kuickshow {
     inherit fetchurl stdenv kdelibs arts libpng libjpeg libtiff libungif imlib expat perl;
     inherit (xlibs) libX11 libXext libSM;