diff --git a/pkgs/development/compilers/jdk/builder.sh b/pkgs/development/compilers/jdk/builder.sh
index b1a8528b938..fb26c26b2b7 100644
--- a/pkgs/development/compilers/jdk/builder.sh
+++ b/pkgs/development/compilers/jdk/builder.sh
@@ -46,3 +46,6 @@ for i in $(find $out -name "*.pack"); do
     $out/bin/unpack200 "$i" "$(dirname $i)/$(basename $i .pack).jar"
     rm "$i"
 done
+
+# Put the *_md.h files in the right place.
+cd $out/include && ln -s */*_md.h .
diff --git a/pkgs/development/libraries/java/swt/builder.sh b/pkgs/development/libraries/java/swt/builder.sh
new file mode 100644
index 00000000000..624b2c86513
--- /dev/null
+++ b/pkgs/development/libraries/java/swt/builder.sh
@@ -0,0 +1,16 @@
+source $stdenv/setup
+
+unzip $src src.zip
+unzip src.zip
+
+sh ./build.sh make_swt make_atk
+
+ensureDir $out/lib
+cp *.so $out/lib
+
+mkdir out
+javac -d out/ $(find org/ -name "*.java")
+
+ensureDir $out/jars
+cp version.txt out/
+cd out && jar -c * > $out/jars/swt.jar
diff --git a/pkgs/development/libraries/java/swt/default.nix b/pkgs/development/libraries/java/swt/default.nix
new file mode 100644
index 00000000000..aa9ee965bc7
--- /dev/null
+++ b/pkgs/development/libraries/java/swt/default.nix
@@ -0,0 +1,16 @@
+{stdenv, fetchurl, unzip, jdk, pkgconfig, gtk, libXtst}:
+
+stdenv.mkDerivation {
+  name = "swt-3.1.1";
+  builder = ./builder.sh;
+  
+  # Alas, the Eclipse Project apparently doesn't produce source-only
+  # releases of SWT.  So we just grab a binary release and extract
+  # "src.zip" from that.
+  src = fetchurl {
+    url = ftp://ftp.tu-clausthal.de/pub/eclipse/downloads/drops/R-3.1.1-200509290840/swt-3.1.1-gtk-linux-x86.zip;
+    md5 = "23dfe5a4a566439c5f526d9ea3b3db1c";
+  };
+  
+  buildInputs = [unzip jdk pkgconfig gtk libXtst];
+}
diff --git a/pkgs/system/all-packages-generic.nix b/pkgs/system/all-packages-generic.nix
index b1ffa011657..8b781fa3a36 100644
--- a/pkgs/system/all-packages-generic.nix
+++ b/pkgs/system/all-packages-generic.nix
@@ -214,6 +214,10 @@ rec {
     inherit fetchurl stdenv python pygtk makeWrapper;
   };
 
+  azureus = import ../tools/networking/azureus {
+    inherit fetchurl stdenv jdk swt;
+  };
+
   dhcp = (import ../tools/networking/dhcp) {
     inherit fetchurl stdenv groff nettools coreutils iputils gnused bash;
   };
@@ -1142,11 +1146,11 @@ rec {
   };
 
   lucene = import ../development/libraries/java/lucene {
-      inherit stdenv fetchurl;
+    inherit stdenv fetchurl;
   };
 
   jdom = import ../development/libraries/java/jdom {
-      inherit stdenv fetchurl;
+    inherit stdenv fetchurl;
   };
 
   javaCup = import ../development/libraries/java/cup {
@@ -1154,27 +1158,33 @@ rec {
   };
 
   jflex = import ../development/libraries/java/jflex {
-      inherit stdenv fetchurl;
+    inherit stdenv fetchurl;
   };
 
   junit = import ../development/libraries/java/junit {
-      inherit stdenv fetchurl unzip;
+    inherit stdenv fetchurl unzip;
   };
 
   javasvn = import ../development/libraries/java/javasvn {
-      inherit stdenv fetchurl unzip;
+    inherit stdenv fetchurl unzip;
   };
 
   httpunit = import ../development/libraries/java/httpunit {
-      inherit stdenv fetchurl unzip;
+    inherit stdenv fetchurl unzip;
   };
 
   mockobjects = import ../development/libraries/java/mockobjects {
-      inherit stdenv fetchurl;
+    inherit stdenv fetchurl;
   };
 
   commonsFileUpload = import ../development/libraries/java/jakarta-commons/file-upload {
-      inherit stdenv fetchurl;
+    inherit stdenv fetchurl;
+  };
+
+  swt = import ../development/libraries/java/swt {
+    inherit stdenv fetchurl unzip jdk pkgconfig;
+    inherit (gtkLibs) gtk;
+    inherit (xlibs) libXtst;
   };
 
   ### DEVELOPMENT / PERL MODULES
diff --git a/pkgs/tools/networking/azureus/builder.sh b/pkgs/tools/networking/azureus/builder.sh
new file mode 100644
index 00000000000..13b7a483192
--- /dev/null
+++ b/pkgs/tools/networking/azureus/builder.sh
@@ -0,0 +1,19 @@
+source $stdenv/setup
+
+ensureDir $out/jars
+cp $src $out/jars/azureus.jar
+
+ensureDir $out/bin
+cat > $out/bin/azureus <<EOF
+#! $SHELL -e
+azureusHome=$out
+if test -n "\$HOME"; then
+    azureusHome=\$HOME/.Azureus
+fi
+exec $jdk/bin/java -Xms16m -Xmx128m \
+  -cp $out/jars/azureus.jar:$swt/jars/swt.jar \
+  -Djava.library.path=$swt/lib \
+  -Dazureus.install.path=\$azureusHome \
+  org.gudy.azureus2.ui.swt.Main
+EOF
+chmod +x $out/bin/azureus
diff --git a/pkgs/tools/networking/azureus/default.nix b/pkgs/tools/networking/azureus/default.nix
new file mode 100644
index 00000000000..0e1aa7409f4
--- /dev/null
+++ b/pkgs/tools/networking/azureus/default.nix
@@ -0,0 +1,12 @@
+{stdenv, fetchurl, jdk, swt}:
+
+stdenv.mkDerivation {
+  name = "azureus-2.3.0.6";
+  builder = ./builder.sh;
+  src = fetchurl {
+    url = http://surfnet.dl.sourceforge.net/sourceforge/azureus/Azureus2.3.0.6.jar;
+    md5 = "84f85b144cdc574338c2c84d659ca620";
+  };
+#  buildInputs = [unzip];
+  inherit jdk swt;
+}