diff --git a/pkgs/development/tools/parsing/sdf2/builder.sh b/pkgs/development/tools/parsing/sdf2-bundle/builder.sh
similarity index 100%
rename from pkgs/development/tools/parsing/sdf2/builder.sh
rename to pkgs/development/tools/parsing/sdf2-bundle/builder.sh
diff --git a/pkgs/development/tools/parsing/sdf2/default.nix b/pkgs/development/tools/parsing/sdf2-bundle/default.nix
similarity index 100%
rename from pkgs/development/tools/parsing/sdf2/default.nix
rename to pkgs/development/tools/parsing/sdf2-bundle/default.nix
diff --git a/pkgs/development/tools/parsing/sdf2/bundle-2.0.nix b/pkgs/development/tools/parsing/sdf2/bundle-2.0.nix
new file mode 100644
index 00000000000..c718d072790
--- /dev/null
+++ b/pkgs/development/tools/parsing/sdf2/bundle-2.0.nix
@@ -0,0 +1,32 @@
+{stdenv, fetchurl, getopt, aterm}:
+
+rec {
+
+  toolbuslib = (import ../toolbuslib/toolbuslib-0.5.1.nix) {
+    inherit fetchurl stdenv aterm;
+  };
+
+  ptsupport = (import ../pt-support/pt-support-1.0.nix) {
+    inherit fetchurl stdenv aterm toolbuslib;
+  };
+
+  asfsupport = (import ../asf-support/asf-support-1.2.nix) {
+    inherit fetchurl stdenv aterm ptsupport;
+  };
+
+  sdfsupport = (import ../sdf-support/sdf-support-2.0.nix) {
+    inherit fetchurl stdenv aterm toolbuslib ptsupport;
+  };
+
+  sglr = (import ../sglr/sglr-3.10.2.nix) {
+    inherit fetchurl stdenv aterm toolbuslib ptsupport;
+  };
+
+  ascsupport = (import ../asc-support/asc-support-1.8.nix) {
+    inherit fetchurl stdenv aterm toolbuslib ptsupport asfsupport;
+  };
+
+  pgen = (import ../pgen/pgen-2.0.nix) {
+    inherit fetchurl stdenv getopt aterm toolbuslib ptsupport sdfsupport asfsupport ascsupport sglr;
+  };
+}
diff --git a/pkgs/system/all-packages-generic.nix b/pkgs/system/all-packages-generic.nix
index dbe44625481..f5b90f5bbf8 100644
--- a/pkgs/system/all-packages-generic.nix
+++ b/pkgs/system/all-packages-generic.nix
@@ -230,17 +230,17 @@ rec {
 
   strategoxt = (import ../development/compilers/strategoxt) {
     inherit fetchurl stdenv aterm;
-    sdf = sdf2;
+    sdf = sdf2_bundle;
   };
 
   strategoxtsvn = (import ../development/compilers/strategoxt/trunk.nix) {
     inherit fetchsvn stdenv autoconf automake libtool which aterm;
-    sdf = sdf2;
+    sdf = sdf2_bundle;
   };
 
   tiger = (import ../development/compilers/tiger) {
     inherit fetchurl stdenv aterm strategoxt;
-    sdf = sdf2;
+    sdf = sdf2_bundle;
   };
 
   ghcboot = (import ../development/compilers/ghc/boot.nix) {
@@ -287,57 +287,18 @@ rec {
     inherit fetchurl stdenv;
   };
 
-  sdf = (import ../development/tools/parsing/sdf2/bundle-2.1.nix) {
+  sdf_21 = (import ../development/tools/parsing/sdf2/bundle-2.1.nix) {
     inherit fetchurl stdenv getopt aterm;
   };
 
-  sdf2 = (import ../development/tools/parsing/sdf2) {
+  sdf_20 = (import ../development/tools/parsing/sdf2/bundle-2.0.nix) {
+    inherit fetchurl stdenv getopt aterm;
+  };
+
+  sdf2_bundle = (import ../development/tools/parsing/sdf2-bundle) {
     inherit fetchurl stdenv aterm getopt;
   };
 
-  toolbuslib_0_5_1 = (import ../development/tools/parsing/toolbuslib/toolbuslib-0.5.1.nix) {
-    inherit fetchurl stdenv aterm;
-  };
-
-  ptsupport_1_0 = (import ../development/tools/parsing/pt-support/pt-support-1.0.nix) {
-    inherit fetchurl stdenv aterm;
-    toolbuslib = toolbuslib_0_5_1;
-  };
-
-  sdfsupport_2_0 = (import ../development/tools/parsing/sdf-support/sdf-support-2.0.nix) {
-    inherit fetchurl stdenv aterm;
-    toolbuslib = toolbuslib_0_5_1;
-    ptsupport = ptsupport_1_0;
-  };
-
-  sglr_3_10_2 = (import ../development/tools/parsing/sglr/sglr-3.10.2.nix) {
-    inherit fetchurl stdenv aterm;
-    toolbuslib = toolbuslib_0_5_1;
-    ptsupport = ptsupport_1_0;
-  };
-
-  asfsupport_1_2 = (import ../development/tools/parsing/asf-support/asf-support-1.2.nix) {
-    inherit fetchurl stdenv aterm;
-    ptsupport = ptsupport_1_0;
-  };
-
-  ascsupport_1_8 = (import ../development/tools/parsing/asc-support/asc-support-1.8.nix) {
-    inherit fetchurl stdenv aterm;
-    toolbuslib = toolbuslib_0_5_1;
-    ptsupport = ptsupport_1_0;
-    asfsupport	= asfsupport_1_2;
-  };
-
-  pgen_2_0 = (import ../development/tools/parsing/pgen/pgen-2.0.nix) {
-    inherit fetchurl stdenv getopt aterm;
-    toolbuslib = toolbuslib_0_5_1;
-    ptsupport = ptsupport_1_0;
-    asfsupport = asfsupport_1_2;
-    ascsupport = ascsupport_1_8;
-    sdfsupport = sdfsupport_2_0;
-    sglr = sglr_3_10_2;
-  };
-
   expat = (import ../development/libraries/expat) {
     inherit fetchurl stdenv;
   };