diff --git a/pkgs/development/compilers/aspectj/builder.sh b/pkgs/development/compilers/aspectj/builder.sh
new file mode 100755
index 00000000000..821cf185ac2
--- /dev/null
+++ b/pkgs/development/compilers/aspectj/builder.sh
@@ -0,0 +1,27 @@
+source $stdenv/setup
+
+export JAVA_HOME=$jre
+
+cat >> props <<EOF
+output.dir=$out
+context.javaPath=$jre
+EOF
+
+ensureDir $out
+$jre/bin/java -jar $src -text props
+
+echo "Removing files at top level"
+for file in $out/*
+do
+  if test -f $file ; then
+    rm $file
+  fi
+done
+
+cat >> $out/bin/ajc-env <<EOF
+#! $SHELL
+
+export CLASSPATH=$CLASSPATH:.:/pkg/aspectj/lib/aspectjrt.jar
+EOF
+
+chmod u+x $out/bin/ajc-env
\ No newline at end of file
diff --git a/pkgs/development/compilers/aspectj/default.nix b/pkgs/development/compilers/aspectj/default.nix
new file mode 100644
index 00000000000..10cd8512026
--- /dev/null
+++ b/pkgs/development/compilers/aspectj/default.nix
@@ -0,0 +1,14 @@
+{stdenv, fetchurl, jre}:
+
+stdenv.mkDerivation {
+  name = "aspectj-1.5.0";
+  builder = ./builder.sh;
+
+  src = fetchurl {
+    url = http://www.mirrorservice.org/sites/download.eclipse.org/eclipseMirror/technology/aspectj/aspectj-1.5.0.jar;
+    md5 = "76d716f699cdd84049323992b21f02fb";
+  };
+
+  inherit jre;
+  buildInputs = [jre];
+}
diff --git a/pkgs/development/interpreters/jre/jre-sun-linux.nix b/pkgs/development/interpreters/jre/jre-sun-linux.nix
index abab0cff7be..3376f6d47fe 100644
--- a/pkgs/development/interpreters/jre/jre-sun-linux.nix
+++ b/pkgs/development/interpreters/jre/jre-sun-linux.nix
@@ -4,10 +4,10 @@ assert stdenv.system == "i686-linux";
 
 stdenv.mkDerivation {
   name    = "jre-1.5.0";
-  version = "jre1.5.0_02";
+  version = "jre1.5.0_06";
   builder = ./builder.sh;
   src = fetchurl {
-      url = http://nix.cs.uu.nl/dist/tarballs/AutoDL?BundleId=9986;
-      md5 = "1c9b3bb9670df5ebb5587d2bcba73b3c";
+      url = "http://jdl.sun.com/webapps/download/AutoDL?BundleId=10336";
+      md5 = "e0a88dbec9bfe3195794bb652bfc6516";
     };
 }
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index b789af479d0..ef2be5b7b4d 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -710,14 +710,18 @@ rec {
     inherit fetchurl stdenv;
   };
 
+  aspectj =
+    (import ../development/compilers/aspectj) {
+      inherit stdenv fetchurl jre;
+    };
+
   abc =
     abcPatchable [];
 
   abcPatchable = patches : 
     (import ../development/compilers/abc/default.nix) {
-      inherit stdenv fetchurl patches;
+      inherit stdenv fetchurl patches jre;
       apacheAnt = apacheAntBlackdown14;
-      jre = blackdown;
       javaCup = import ../development/libraries/java/cup {
         inherit stdenv fetchurl;
         jdk = blackdown;
diff --git a/pkgs/top-level/build-for-release.nix b/pkgs/top-level/build-for-release.nix
index 9130ea3fa59..3f1d8022e5c 100644
--- a/pkgs/top-level/build-for-release.nix
+++ b/pkgs/top-level/build-for-release.nix
@@ -8,6 +8,7 @@ let {
     abc
     apacheAntBlackdown14
     apacheHttpd
+    aspectj
     aterm
     autoconf
     automake19x