diff --git a/pkgs/development/interpreters/python/docs/2.6-html.nix b/pkgs/development/interpreters/python/docs/2.6-html.nix
index 66f8c9ae996b..8c6522c9b6c4 100644
--- a/pkgs/development/interpreters/python/docs/2.6-html.nix
+++ b/pkgs/development/interpreters/python/docs/2.6-html.nix
@@ -12,4 +12,7 @@ stdenv.mkDerivation rec {
     mkdir -p $out/share/docs
     cp -R ./ $out/share/docs/${name}
   '';
+  meta = {
+    maintainers = [ lib.maintainers.chaoflow ];
+  };
 }
diff --git a/pkgs/development/interpreters/python/docs/2.6-pdf-a4.nix b/pkgs/development/interpreters/python/docs/2.6-pdf-a4.nix
index c3da7e1dc119..6c0d008e2fa4 100644
--- a/pkgs/development/interpreters/python/docs/2.6-pdf-a4.nix
+++ b/pkgs/development/interpreters/python/docs/2.6-pdf-a4.nix
@@ -12,4 +12,7 @@ stdenv.mkDerivation rec {
     mkdir -p $out/share/docs
     cp -R ./ $out/share/docs/${name}
   '';
+  meta = {
+    maintainers = [ lib.maintainers.chaoflow ];
+  };
 }
diff --git a/pkgs/development/interpreters/python/docs/2.6-pdf-letter.nix b/pkgs/development/interpreters/python/docs/2.6-pdf-letter.nix
index b17be3da822e..fec87fb11c88 100644
--- a/pkgs/development/interpreters/python/docs/2.6-pdf-letter.nix
+++ b/pkgs/development/interpreters/python/docs/2.6-pdf-letter.nix
@@ -12,4 +12,7 @@ stdenv.mkDerivation rec {
     mkdir -p $out/share/docs
     cp -R ./ $out/share/docs/${name}
   '';
+  meta = {
+    maintainers = [ lib.maintainers.chaoflow ];
+  };
 }
diff --git a/pkgs/development/interpreters/python/docs/2.6-text.nix b/pkgs/development/interpreters/python/docs/2.6-text.nix
index 64b44adcccd5..50b3c2eca9cc 100644
--- a/pkgs/development/interpreters/python/docs/2.6-text.nix
+++ b/pkgs/development/interpreters/python/docs/2.6-text.nix
@@ -12,4 +12,7 @@ stdenv.mkDerivation rec {
     mkdir -p $out/share/docs
     cp -R ./ $out/share/docs/${name}
   '';
+  meta = {
+    maintainers = [ lib.maintainers.chaoflow ];
+  };
 }
diff --git a/pkgs/development/interpreters/python/docs/2.7-html.nix b/pkgs/development/interpreters/python/docs/2.7-html.nix
index 7db8d04403c3..db77a1e8487d 100644
--- a/pkgs/development/interpreters/python/docs/2.7-html.nix
+++ b/pkgs/development/interpreters/python/docs/2.7-html.nix
@@ -12,4 +12,7 @@ stdenv.mkDerivation rec {
     mkdir -p $out/share/docs
     cp -R ./ $out/share/docs/${name}
   '';
+  meta = {
+    maintainers = [ lib.maintainers.chaoflow ];
+  };
 }
diff --git a/pkgs/development/interpreters/python/docs/2.7-pdf-a4.nix b/pkgs/development/interpreters/python/docs/2.7-pdf-a4.nix
index fcabd3f4b56f..844ed60db5f2 100644
--- a/pkgs/development/interpreters/python/docs/2.7-pdf-a4.nix
+++ b/pkgs/development/interpreters/python/docs/2.7-pdf-a4.nix
@@ -12,4 +12,7 @@ stdenv.mkDerivation rec {
     mkdir -p $out/share/docs
     cp -R ./ $out/share/docs/${name}
   '';
+  meta = {
+    maintainers = [ lib.maintainers.chaoflow ];
+  };
 }
diff --git a/pkgs/development/interpreters/python/docs/2.7-pdf-letter.nix b/pkgs/development/interpreters/python/docs/2.7-pdf-letter.nix
index 643a2ba2a88d..f4149307c471 100644
--- a/pkgs/development/interpreters/python/docs/2.7-pdf-letter.nix
+++ b/pkgs/development/interpreters/python/docs/2.7-pdf-letter.nix
@@ -12,4 +12,7 @@ stdenv.mkDerivation rec {
     mkdir -p $out/share/docs
     cp -R ./ $out/share/docs/${name}
   '';
+  meta = {
+    maintainers = [ lib.maintainers.chaoflow ];
+  };
 }
diff --git a/pkgs/development/interpreters/python/docs/2.7-text.nix b/pkgs/development/interpreters/python/docs/2.7-text.nix
index 65b236f4e890..cd11b580af43 100644
--- a/pkgs/development/interpreters/python/docs/2.7-text.nix
+++ b/pkgs/development/interpreters/python/docs/2.7-text.nix
@@ -12,4 +12,7 @@ stdenv.mkDerivation rec {
     mkdir -p $out/share/docs
     cp -R ./ $out/share/docs/${name}
   '';
+  meta = {
+    maintainers = [ lib.maintainers.chaoflow ];
+  };
 }
diff --git a/pkgs/development/interpreters/python/docs/3.0-html.nix b/pkgs/development/interpreters/python/docs/3.0-html.nix
index 9c20d6cad4cd..58c73c4a7c92 100644
--- a/pkgs/development/interpreters/python/docs/3.0-html.nix
+++ b/pkgs/development/interpreters/python/docs/3.0-html.nix
@@ -12,4 +12,7 @@ stdenv.mkDerivation rec {
     mkdir -p $out/share/docs
     cp -R ./ $out/share/docs/${name}
   '';
+  meta = {
+    maintainers = [ lib.maintainers.chaoflow ];
+  };
 }
diff --git a/pkgs/development/interpreters/python/docs/3.0-pdf-a4.nix b/pkgs/development/interpreters/python/docs/3.0-pdf-a4.nix
index 5a8fcb1ce402..8bd52d985063 100644
--- a/pkgs/development/interpreters/python/docs/3.0-pdf-a4.nix
+++ b/pkgs/development/interpreters/python/docs/3.0-pdf-a4.nix
@@ -12,4 +12,7 @@ stdenv.mkDerivation rec {
     mkdir -p $out/share/docs
     cp -R ./ $out/share/docs/${name}
   '';
+  meta = {
+    maintainers = [ lib.maintainers.chaoflow ];
+  };
 }
diff --git a/pkgs/development/interpreters/python/docs/3.0-pdf-letter.nix b/pkgs/development/interpreters/python/docs/3.0-pdf-letter.nix
index cf5116dac48b..32d3ddf81751 100644
--- a/pkgs/development/interpreters/python/docs/3.0-pdf-letter.nix
+++ b/pkgs/development/interpreters/python/docs/3.0-pdf-letter.nix
@@ -12,4 +12,7 @@ stdenv.mkDerivation rec {
     mkdir -p $out/share/docs
     cp -R ./ $out/share/docs/${name}
   '';
+  meta = {
+    maintainers = [ lib.maintainers.chaoflow ];
+  };
 }
diff --git a/pkgs/development/interpreters/python/docs/3.0-text.nix b/pkgs/development/interpreters/python/docs/3.0-text.nix
index c1af5cd686b9..966c705c6af7 100644
--- a/pkgs/development/interpreters/python/docs/3.0-text.nix
+++ b/pkgs/development/interpreters/python/docs/3.0-text.nix
@@ -12,4 +12,7 @@ stdenv.mkDerivation rec {
     mkdir -p $out/share/docs
     cp -R ./ $out/share/docs/${name}
   '';
+  meta = {
+    maintainers = [ lib.maintainers.chaoflow ];
+  };
 }
diff --git a/pkgs/development/interpreters/python/docs/3.1-html.nix b/pkgs/development/interpreters/python/docs/3.1-html.nix
index d85007ee455e..6963681ae899 100644
--- a/pkgs/development/interpreters/python/docs/3.1-html.nix
+++ b/pkgs/development/interpreters/python/docs/3.1-html.nix
@@ -12,4 +12,7 @@ stdenv.mkDerivation rec {
     mkdir -p $out/share/docs
     cp -R ./ $out/share/docs/${name}
   '';
+  meta = {
+    maintainers = [ lib.maintainers.chaoflow ];
+  };
 }
diff --git a/pkgs/development/interpreters/python/docs/3.1-pdf-a4.nix b/pkgs/development/interpreters/python/docs/3.1-pdf-a4.nix
index 0a260e86e7d7..8078805266d3 100644
--- a/pkgs/development/interpreters/python/docs/3.1-pdf-a4.nix
+++ b/pkgs/development/interpreters/python/docs/3.1-pdf-a4.nix
@@ -12,4 +12,7 @@ stdenv.mkDerivation rec {
     mkdir -p $out/share/docs
     cp -R ./ $out/share/docs/${name}
   '';
+  meta = {
+    maintainers = [ lib.maintainers.chaoflow ];
+  };
 }
diff --git a/pkgs/development/interpreters/python/docs/3.1-pdf-letter.nix b/pkgs/development/interpreters/python/docs/3.1-pdf-letter.nix
index e54ec24490a0..233d678140b2 100644
--- a/pkgs/development/interpreters/python/docs/3.1-pdf-letter.nix
+++ b/pkgs/development/interpreters/python/docs/3.1-pdf-letter.nix
@@ -12,4 +12,7 @@ stdenv.mkDerivation rec {
     mkdir -p $out/share/docs
     cp -R ./ $out/share/docs/${name}
   '';
+  meta = {
+    maintainers = [ lib.maintainers.chaoflow ];
+  };
 }
diff --git a/pkgs/development/interpreters/python/docs/3.1-text.nix b/pkgs/development/interpreters/python/docs/3.1-text.nix
index ea6376744698..7687f6dd8ca8 100644
--- a/pkgs/development/interpreters/python/docs/3.1-text.nix
+++ b/pkgs/development/interpreters/python/docs/3.1-text.nix
@@ -12,4 +12,7 @@ stdenv.mkDerivation rec {
     mkdir -p $out/share/docs
     cp -R ./ $out/share/docs/${name}
   '';
+  meta = {
+    maintainers = [ lib.maintainers.chaoflow ];
+  };
 }
diff --git a/pkgs/development/interpreters/python/docs/3.2-html.nix b/pkgs/development/interpreters/python/docs/3.2-html.nix
index c55ad82a985f..d686fe0281fb 100644
--- a/pkgs/development/interpreters/python/docs/3.2-html.nix
+++ b/pkgs/development/interpreters/python/docs/3.2-html.nix
@@ -12,4 +12,7 @@ stdenv.mkDerivation rec {
     mkdir -p $out/share/docs
     cp -R ./ $out/share/docs/${name}
   '';
+  meta = {
+    maintainers = [ lib.maintainers.chaoflow ];
+  };
 }
diff --git a/pkgs/development/interpreters/python/docs/3.2-pdf-a4.nix b/pkgs/development/interpreters/python/docs/3.2-pdf-a4.nix
index 3c19afa16b74..c741fdcdce6f 100644
--- a/pkgs/development/interpreters/python/docs/3.2-pdf-a4.nix
+++ b/pkgs/development/interpreters/python/docs/3.2-pdf-a4.nix
@@ -12,4 +12,7 @@ stdenv.mkDerivation rec {
     mkdir -p $out/share/docs
     cp -R ./ $out/share/docs/${name}
   '';
+  meta = {
+    maintainers = [ lib.maintainers.chaoflow ];
+  };
 }
diff --git a/pkgs/development/interpreters/python/docs/3.2-pdf-letter.nix b/pkgs/development/interpreters/python/docs/3.2-pdf-letter.nix
index 5b3180c415c6..1a95f0a673ee 100644
--- a/pkgs/development/interpreters/python/docs/3.2-pdf-letter.nix
+++ b/pkgs/development/interpreters/python/docs/3.2-pdf-letter.nix
@@ -12,4 +12,7 @@ stdenv.mkDerivation rec {
     mkdir -p $out/share/docs
     cp -R ./ $out/share/docs/${name}
   '';
+  meta = {
+    maintainers = [ lib.maintainers.chaoflow ];
+  };
 }
diff --git a/pkgs/development/interpreters/python/docs/3.2-text.nix b/pkgs/development/interpreters/python/docs/3.2-text.nix
index 8cf4160a76a9..3ee06d3f0ae0 100644
--- a/pkgs/development/interpreters/python/docs/3.2-text.nix
+++ b/pkgs/development/interpreters/python/docs/3.2-text.nix
@@ -12,4 +12,7 @@ stdenv.mkDerivation rec {
     mkdir -p $out/share/docs
     cp -R ./ $out/share/docs/${name}
   '';
+  meta = {
+    maintainers = [ lib.maintainers.chaoflow ];
+  };
 }
diff --git a/pkgs/development/interpreters/python/docs/3.3-html.nix b/pkgs/development/interpreters/python/docs/3.3-html.nix
index 5421e6be195b..564bbfd7a072 100644
--- a/pkgs/development/interpreters/python/docs/3.3-html.nix
+++ b/pkgs/development/interpreters/python/docs/3.3-html.nix
@@ -12,4 +12,7 @@ stdenv.mkDerivation rec {
     mkdir -p $out/share/docs
     cp -R ./ $out/share/docs/${name}
   '';
+  meta = {
+    maintainers = [ lib.maintainers.chaoflow ];
+  };
 }
diff --git a/pkgs/development/interpreters/python/docs/3.3-pdf-a4.nix b/pkgs/development/interpreters/python/docs/3.3-pdf-a4.nix
index 7326a1b3c927..8e6206f0d390 100644
--- a/pkgs/development/interpreters/python/docs/3.3-pdf-a4.nix
+++ b/pkgs/development/interpreters/python/docs/3.3-pdf-a4.nix
@@ -12,4 +12,7 @@ stdenv.mkDerivation rec {
     mkdir -p $out/share/docs
     cp -R ./ $out/share/docs/${name}
   '';
+  meta = {
+    maintainers = [ lib.maintainers.chaoflow ];
+  };
 }
diff --git a/pkgs/development/interpreters/python/docs/3.3-pdf-letter.nix b/pkgs/development/interpreters/python/docs/3.3-pdf-letter.nix
index c918ecc6f4f8..14036122c95b 100644
--- a/pkgs/development/interpreters/python/docs/3.3-pdf-letter.nix
+++ b/pkgs/development/interpreters/python/docs/3.3-pdf-letter.nix
@@ -12,4 +12,7 @@ stdenv.mkDerivation rec {
     mkdir -p $out/share/docs
     cp -R ./ $out/share/docs/${name}
   '';
+  meta = {
+    maintainers = [ lib.maintainers.chaoflow ];
+  };
 }
diff --git a/pkgs/development/interpreters/python/docs/3.3-text.nix b/pkgs/development/interpreters/python/docs/3.3-text.nix
index 99752b9d08d4..b8faa4c3cfe0 100644
--- a/pkgs/development/interpreters/python/docs/3.3-text.nix
+++ b/pkgs/development/interpreters/python/docs/3.3-text.nix
@@ -12,4 +12,7 @@ stdenv.mkDerivation rec {
     mkdir -p $out/share/docs
     cp -R ./ $out/share/docs/${name}
   '';
+  meta = {
+    maintainers = [ lib.maintainers.chaoflow ];
+  };
 }
diff --git a/pkgs/development/interpreters/python/docs/default.nix b/pkgs/development/interpreters/python/docs/default.nix
index 165e89c4b803..9ec67173be3f 100644
--- a/pkgs/development/interpreters/python/docs/default.nix
+++ b/pkgs/development/interpreters/python/docs/default.nix
@@ -2,76 +2,84 @@
 
 let
 pythonDocs = {
-  python33_html = import ./3.3-html.nix {
-    inherit stdenv fetchurl;
+  html = {
+    python33 = import ./3.3-html.nix {
+      inherit stdenv fetchurl;
+    };
+    python32 = import ./3.2-html.nix {
+      inherit stdenv fetchurl;
+    };
+    python31 = import ./3.1-html.nix {
+      inherit stdenv fetchurl;
+    };
+    python30 = import ./3.0-html.nix {
+      inherit stdenv fetchurl;
+    };
+    python27 = import ./2.7-html.nix {
+      inherit stdenv fetchurl;
+    };
+    python26 = import ./2.6-html.nix {
+      inherit stdenv fetchurl;
+    };
   };
-  python33_pdf_a4 = import ./3.3-pdf-a4.nix {
-    inherit stdenv fetchurl;
+  pdf_a4 = {
+    python33 = import ./3.3-pdf-a4.nix {
+      inherit stdenv fetchurl;
+    };
+    python32 = import ./3.2-pdf-a4.nix {
+      inherit stdenv fetchurl;
+    };
+    python31 = import ./3.1-pdf-a4.nix {
+      inherit stdenv fetchurl;
+    };
+    python30 = import ./3.0-pdf-a4.nix {
+      inherit stdenv fetchurl;
+    };
+    python27 = import ./2.7-pdf-a4.nix {
+      inherit stdenv fetchurl;
+    };
+    python26 = import ./2.6-pdf-a4.nix {
+      inherit stdenv fetchurl;
+    };
   };
-  python33_pdf_letter = import ./3.3-pdf-letter.nix {
-    inherit stdenv fetchurl;
+  pdf_letter = {
+    python33 = import ./3.3-pdf-letter.nix {
+      inherit stdenv fetchurl;
+    };
+    python32 = import ./3.2-pdf-letter.nix {
+      inherit stdenv fetchurl;
+    };
+    python31 = import ./3.1-pdf-letter.nix {
+      inherit stdenv fetchurl;
+    };
+    python30 = import ./3.0-pdf-letter.nix {
+      inherit stdenv fetchurl;
+    };
+    python27 = import ./2.7-pdf-letter.nix {
+      inherit stdenv fetchurl;
+    };
+    python26 = import ./2.6-pdf-letter.nix {
+      inherit stdenv fetchurl;
+    };
   };
-  python33_text = import ./3.3-text.nix {
-    inherit stdenv fetchurl;
-  };
-  python32_html = import ./3.2-html.nix {
-    inherit stdenv fetchurl;
-  };
-  python32_pdf_a4 = import ./3.2-pdf-a4.nix {
-    inherit stdenv fetchurl;
-  };
-  python32_pdf_letter = import ./3.2-pdf-letter.nix {
-    inherit stdenv fetchurl;
-  };
-  python32_text = import ./3.2-text.nix {
-    inherit stdenv fetchurl;
-  };
-  python31_html = import ./3.1-html.nix {
-    inherit stdenv fetchurl;
-  };
-  python31_pdf_a4 = import ./3.1-pdf-a4.nix {
-    inherit stdenv fetchurl;
-  };
-  python31_pdf_letter = import ./3.1-pdf-letter.nix {
-    inherit stdenv fetchurl;
-  };
-  python31_text = import ./3.1-text.nix {
-    inherit stdenv fetchurl;
-  };
-  python30_html = import ./3.0-html.nix {
-    inherit stdenv fetchurl;
-  };
-  python30_pdf_a4 = import ./3.0-pdf-a4.nix {
-    inherit stdenv fetchurl;
-  };
-  python30_pdf_letter = import ./3.0-pdf-letter.nix {
-    inherit stdenv fetchurl;
-  };
-  python30_text = import ./3.0-text.nix {
-    inherit stdenv fetchurl;
-  };
-  python27_html = import ./2.7-html.nix {
-    inherit stdenv fetchurl;
-  };
-  python27_pdf_a4 = import ./2.7-pdf-a4.nix {
-    inherit stdenv fetchurl;
-  };
-  python27_pdf_letter = import ./2.7-pdf-letter.nix {
-    inherit stdenv fetchurl;
-  };
-  python27_text = import ./2.7-text.nix {
-    inherit stdenv fetchurl;
-  };
-  python26_html = import ./2.6-html.nix {
-    inherit stdenv fetchurl;
-  };
-  python26_pdf_a4 = import ./2.6-pdf-a4.nix {
-    inherit stdenv fetchurl;
-  };
-  python26_pdf_letter = import ./2.6-pdf-letter.nix {
-    inherit stdenv fetchurl;
-  };
-  python26_text = import ./2.6-text.nix {
-    inherit stdenv fetchurl;
+  text = {
+    python33 = import ./3.3-text.nix {
+      inherit stdenv fetchurl;
+    };
+    python32 = import ./3.2-text.nix {
+      inherit stdenv fetchurl;
+    };
+    python31 = import ./3.1-text.nix {
+      inherit stdenv fetchurl;
+    };
+    python30 = import ./3.0-text.nix {
+      inherit stdenv fetchurl;
+    };
+    python27 = import ./2.7-text.nix {
+      inherit stdenv fetchurl;
+    };
+    python26 = import ./2.6-text.nix {
+      inherit stdenv fetchurl;
+    };
   };
 }; in pythonDocs
diff --git a/pkgs/development/interpreters/python/docs/generate.sh b/pkgs/development/interpreters/python/docs/generate.sh
index c5e990c3a99f..10d457e7836e 100755
--- a/pkgs/development/interpreters/python/docs/generate.sh
+++ b/pkgs/development/interpreters/python/docs/generate.sh
@@ -15,8 +15,9 @@ let
 pythonDocs = {
 EOF
 
-for version in $VERSIONS; do
-    for type in $TYPES; do
+for type in $TYPES; do
+    echo "  ${type/-/_} = {" >> default.nix
+    for version in $VERSIONS; do
         major=$(echo -n ${version}| cut -d. -f1)
         minor=$(echo -n ${version}| cut -d. -f2)
         outfile=${major}.${minor}-${type}.nix
@@ -38,16 +39,17 @@ for version in $VERSIONS; do
             -e "s,URL,${url}," \
             -e "s,SHA,${sha}," < template.nix > ${outfile}
 
-        attrname=python${major}${minor}_$(echo -n ${type} |sed -e "s,-,_,g")
+        attrname=python${major}${minor}
         cat >>default.nix <<EOF
-  ${attrname} = import ./${major}.${minor}-${type}.nix {
-    inherit stdenv fetchurl;
-  };
+    ${attrname} = import ./${major}.${minor}-${type}.nix {
+      inherit stdenv fetchurl;
+    };
 EOF
 
         echo "done."
         echo
     done
+    echo "  };" >> default.nix
 done
 
 echo "}; in pythonDocs" >> default.nix
diff --git a/pkgs/development/interpreters/python/docs/template.nix b/pkgs/development/interpreters/python/docs/template.nix
index 263878b3f758..17bc19a4e73d 100644
--- a/pkgs/development/interpreters/python/docs/template.nix
+++ b/pkgs/development/interpreters/python/docs/template.nix
@@ -12,4 +12,7 @@ stdenv.mkDerivation rec {
     mkdir -p $out/share/docs
     cp -R ./ $out/share/docs/${name}
   '';
+  meta = {
+    maintainers = [ lib.maintainers.chaoflow ];
+  };
 }