diff --git a/pkgs/development/interpreters/python/docs/2.6-html.nix b/pkgs/development/interpreters/python/docs/2.6-html.nix
index b7ad8c21d5a3..2b41f122fa9b 100644
--- a/pkgs/development/interpreters/python/docs/2.6-html.nix
+++ b/pkgs/development/interpreters/python/docs/2.6-html.nix
@@ -9,8 +9,8 @@ stdenv.mkDerivation rec {
     sha256 = "09kznik9ahmnrqw9gkr7mjv3b3zr258f2fm27n12hrrwwsaszkni";
   };
   installPhase = ''
-    mkdir -p $out/share/doc
-    cp -R ./ $out/share/doc/${name}
+    mkdir -p $out/share/doc/python26
+    cp -R ./ $out/share/doc/python26/html
   '';
   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 96ec6cf7037b..ec031821a03f 100644
--- a/pkgs/development/interpreters/python/docs/2.6-pdf-a4.nix
+++ b/pkgs/development/interpreters/python/docs/2.6-pdf-a4.nix
@@ -9,8 +9,8 @@ stdenv.mkDerivation rec {
     sha256 = "07k8n9zhd59s1yn8ahsizkaqnv969p0f2c2acxgxrxhhyy842pp8";
   };
   installPhase = ''
-    mkdir -p $out/share/doc
-    cp -R ./ $out/share/doc/${name}
+    mkdir -p $out/share/doc/python26
+    cp -R ./ $out/share/doc/python26/pdf-a4
   '';
   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 db870f8fe999..7cacf7778348 100644
--- a/pkgs/development/interpreters/python/docs/2.6-pdf-letter.nix
+++ b/pkgs/development/interpreters/python/docs/2.6-pdf-letter.nix
@@ -9,8 +9,8 @@ stdenv.mkDerivation rec {
     sha256 = "01r87m8hb7f9ql4j9zcjcrr9150nsk23sj8cy02vygr83sc1ldmq";
   };
   installPhase = ''
-    mkdir -p $out/share/doc
-    cp -R ./ $out/share/doc/${name}
+    mkdir -p $out/share/doc/python26
+    cp -R ./ $out/share/doc/python26/pdf-letter
   '';
   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 aa71ede39653..eb394a3f3e2d 100644
--- a/pkgs/development/interpreters/python/docs/2.6-text.nix
+++ b/pkgs/development/interpreters/python/docs/2.6-text.nix
@@ -9,8 +9,8 @@ stdenv.mkDerivation rec {
     sha256 = "05wsdh6ilgkclgak09fq7fsx5kflkmqq8dyxi2rpydx289cw3a8c";
   };
   installPhase = ''
-    mkdir -p $out/share/doc
-    cp -R ./ $out/share/doc/${name}
+    mkdir -p $out/share/doc/python26
+    cp -R ./ $out/share/doc/python26/text
   '';
   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 995517c34ee4..3885b43960f5 100644
--- a/pkgs/development/interpreters/python/docs/2.7-html.nix
+++ b/pkgs/development/interpreters/python/docs/2.7-html.nix
@@ -9,8 +9,8 @@ stdenv.mkDerivation rec {
     sha256 = "1hg92n0mzl9w6j33b2h0bf2vy6fsxnpxfdc3qw760vcm0y00155j";
   };
   installPhase = ''
-    mkdir -p $out/share/doc
-    cp -R ./ $out/share/doc/${name}
+    mkdir -p $out/share/doc/python27
+    cp -R ./ $out/share/doc/python27/html
   '';
   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 f7cd2b554bdc..d8dde17ac66a 100644
--- a/pkgs/development/interpreters/python/docs/2.7-pdf-a4.nix
+++ b/pkgs/development/interpreters/python/docs/2.7-pdf-a4.nix
@@ -9,8 +9,8 @@ stdenv.mkDerivation rec {
     sha256 = "13da88panq5b6qfhf8k4dgqgxkg4ydcac5cx69a3f35s1w90xdjr";
   };
   installPhase = ''
-    mkdir -p $out/share/doc
-    cp -R ./ $out/share/doc/${name}
+    mkdir -p $out/share/doc/python27
+    cp -R ./ $out/share/doc/python27/pdf-a4
   '';
   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 84f97b39ee77..32581cd229a9 100644
--- a/pkgs/development/interpreters/python/docs/2.7-pdf-letter.nix
+++ b/pkgs/development/interpreters/python/docs/2.7-pdf-letter.nix
@@ -9,8 +9,8 @@ stdenv.mkDerivation rec {
     sha256 = "0x41phsdrpivhzkchswsliyx3a10n7gzc9irkrw6rz22j81bfydg";
   };
   installPhase = ''
-    mkdir -p $out/share/doc
-    cp -R ./ $out/share/doc/${name}
+    mkdir -p $out/share/doc/python27
+    cp -R ./ $out/share/doc/python27/pdf-letter
   '';
   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 8fec1c6bc274..590192383016 100644
--- a/pkgs/development/interpreters/python/docs/2.7-text.nix
+++ b/pkgs/development/interpreters/python/docs/2.7-text.nix
@@ -9,8 +9,8 @@ stdenv.mkDerivation rec {
     sha256 = "1rxlb3jhh3892y65i45nk1y2lx981fr22a5hmfkp9gvjvdykjnzp";
   };
   installPhase = ''
-    mkdir -p $out/share/doc
-    cp -R ./ $out/share/doc/${name}
+    mkdir -p $out/share/doc/python27
+    cp -R ./ $out/share/doc/python27/text
   '';
   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 26e7be730b6e..fb793da3e5ff 100644
--- a/pkgs/development/interpreters/python/docs/3.0-html.nix
+++ b/pkgs/development/interpreters/python/docs/3.0-html.nix
@@ -9,8 +9,8 @@ stdenv.mkDerivation rec {
     sha256 = "0ybjnhg8qfr9kc4axm5xlghkz9dmsg6b1caj6m4gz28q89vggv3c";
   };
   installPhase = ''
-    mkdir -p $out/share/doc
-    cp -R ./ $out/share/doc/${name}
+    mkdir -p $out/share/doc/python30
+    cp -R ./ $out/share/doc/python30/html
   '';
   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 1f27b2db839f..e4b185a11c6b 100644
--- a/pkgs/development/interpreters/python/docs/3.0-pdf-a4.nix
+++ b/pkgs/development/interpreters/python/docs/3.0-pdf-a4.nix
@@ -9,8 +9,8 @@ stdenv.mkDerivation rec {
     sha256 = "1qgcydqxxhy317lkzzs2v5as4hcwcblir8y3mdr173qsg51iggra";
   };
   installPhase = ''
-    mkdir -p $out/share/doc
-    cp -R ./ $out/share/doc/${name}
+    mkdir -p $out/share/doc/python30
+    cp -R ./ $out/share/doc/python30/pdf-a4
   '';
   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 4502a03191ca..1373ae21284b 100644
--- a/pkgs/development/interpreters/python/docs/3.0-pdf-letter.nix
+++ b/pkgs/development/interpreters/python/docs/3.0-pdf-letter.nix
@@ -9,8 +9,8 @@ stdenv.mkDerivation rec {
     sha256 = "1x59q0k6fv55vvpsgr5xcq66k5zsd0f142cp6aa4rb6c81i31yml";
   };
   installPhase = ''
-    mkdir -p $out/share/doc
-    cp -R ./ $out/share/doc/${name}
+    mkdir -p $out/share/doc/python30
+    cp -R ./ $out/share/doc/python30/pdf-letter
   '';
   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 53298c984a27..c37fa99f7c5b 100644
--- a/pkgs/development/interpreters/python/docs/3.0-text.nix
+++ b/pkgs/development/interpreters/python/docs/3.0-text.nix
@@ -9,8 +9,8 @@ stdenv.mkDerivation rec {
     sha256 = "12qlh9ywbnw50wk5siq7lmhr935dd16q3vjbii6gfv0g80b1byzx";
   };
   installPhase = ''
-    mkdir -p $out/share/doc
-    cp -R ./ $out/share/doc/${name}
+    mkdir -p $out/share/doc/python30
+    cp -R ./ $out/share/doc/python30/text
   '';
   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 6a80fef10ee2..625aa181c63f 100644
--- a/pkgs/development/interpreters/python/docs/3.1-html.nix
+++ b/pkgs/development/interpreters/python/docs/3.1-html.nix
@@ -9,8 +9,8 @@ stdenv.mkDerivation rec {
     sha256 = "187shb92218k0i07hj9ak1kqbqjcxkivmwxlzj18v791l7x7qcpz";
   };
   installPhase = ''
-    mkdir -p $out/share/doc
-    cp -R ./ $out/share/doc/${name}
+    mkdir -p $out/share/doc/python31
+    cp -R ./ $out/share/doc/python31/html
   '';
   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 d0a4298215c7..564103dd101a 100644
--- a/pkgs/development/interpreters/python/docs/3.1-pdf-a4.nix
+++ b/pkgs/development/interpreters/python/docs/3.1-pdf-a4.nix
@@ -9,8 +9,8 @@ stdenv.mkDerivation rec {
     sha256 = "0kbj6b43gnwlb1czkzmirasmc31j10plq0rlb9s9rh8phqnbmhx1";
   };
   installPhase = ''
-    mkdir -p $out/share/doc
-    cp -R ./ $out/share/doc/${name}
+    mkdir -p $out/share/doc/python31
+    cp -R ./ $out/share/doc/python31/pdf-a4
   '';
   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 04b83dfacabf..d6e3009f59c9 100644
--- a/pkgs/development/interpreters/python/docs/3.1-pdf-letter.nix
+++ b/pkgs/development/interpreters/python/docs/3.1-pdf-letter.nix
@@ -9,8 +9,8 @@ stdenv.mkDerivation rec {
     sha256 = "0s202vrjfa8dnp3vpfjb21bmqym9wyj8jn2glgwjzk63z6fwb60i";
   };
   installPhase = ''
-    mkdir -p $out/share/doc
-    cp -R ./ $out/share/doc/${name}
+    mkdir -p $out/share/doc/python31
+    cp -R ./ $out/share/doc/python31/pdf-letter
   '';
   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 4bc4bd10e355..3ce559e3ecc5 100644
--- a/pkgs/development/interpreters/python/docs/3.1-text.nix
+++ b/pkgs/development/interpreters/python/docs/3.1-text.nix
@@ -9,8 +9,8 @@ stdenv.mkDerivation rec {
     sha256 = "1jsfgfgdi1i2l3lhdk7ss5gwrcg3qhhh8syfrwz8xrv2klmmmn9b";
   };
   installPhase = ''
-    mkdir -p $out/share/doc
-    cp -R ./ $out/share/doc/${name}
+    mkdir -p $out/share/doc/python31
+    cp -R ./ $out/share/doc/python31/text
   '';
   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 5f9dc98aeb1a..146901005489 100644
--- a/pkgs/development/interpreters/python/docs/3.2-html.nix
+++ b/pkgs/development/interpreters/python/docs/3.2-html.nix
@@ -9,8 +9,8 @@ stdenv.mkDerivation rec {
     sha256 = "058pryg0gn0rlpswkj1z0xvpr39s3ymx3dwqfhhf83w0mlysdm0x";
   };
   installPhase = ''
-    mkdir -p $out/share/doc
-    cp -R ./ $out/share/doc/${name}
+    mkdir -p $out/share/doc/python32
+    cp -R ./ $out/share/doc/python32/html
   '';
   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 6433237f609a..729101b2d012 100644
--- a/pkgs/development/interpreters/python/docs/3.2-pdf-a4.nix
+++ b/pkgs/development/interpreters/python/docs/3.2-pdf-a4.nix
@@ -9,8 +9,8 @@ stdenv.mkDerivation rec {
     sha256 = "1lw1sbk3nx70k2zxgjc36ryvyzlxndzsvhrxyzdy9sjfhasyd807";
   };
   installPhase = ''
-    mkdir -p $out/share/doc
-    cp -R ./ $out/share/doc/${name}
+    mkdir -p $out/share/doc/python32
+    cp -R ./ $out/share/doc/python32/pdf-a4
   '';
   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 2d9fd02b1b55..da9b0ce4dccb 100644
--- a/pkgs/development/interpreters/python/docs/3.2-pdf-letter.nix
+++ b/pkgs/development/interpreters/python/docs/3.2-pdf-letter.nix
@@ -9,8 +9,8 @@ stdenv.mkDerivation rec {
     sha256 = "199ibzslw3zrwjd49582vc5q6ghp5ig8zalvslawz0xkz1226wg2";
   };
   installPhase = ''
-    mkdir -p $out/share/doc
-    cp -R ./ $out/share/doc/${name}
+    mkdir -p $out/share/doc/python32
+    cp -R ./ $out/share/doc/python32/pdf-letter
   '';
   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 8673d1cc40e0..3ceef2431f73 100644
--- a/pkgs/development/interpreters/python/docs/3.2-text.nix
+++ b/pkgs/development/interpreters/python/docs/3.2-text.nix
@@ -9,8 +9,8 @@ stdenv.mkDerivation rec {
     sha256 = "1jdc9rj2b4vsbvg5mq6vcdfa2b72avhhvjw7rn7k3kl521cvxs09";
   };
   installPhase = ''
-    mkdir -p $out/share/doc
-    cp -R ./ $out/share/doc/${name}
+    mkdir -p $out/share/doc/python32
+    cp -R ./ $out/share/doc/python32/text
   '';
   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 16be9bf9a91b..055224dd740b 100644
--- a/pkgs/development/interpreters/python/docs/3.3-html.nix
+++ b/pkgs/development/interpreters/python/docs/3.3-html.nix
@@ -9,8 +9,8 @@ stdenv.mkDerivation rec {
     sha256 = "0vv24b9qi7gznv687ik0pa2w1rq9grqivy44znvj2ysjfg7mc2c1";
   };
   installPhase = ''
-    mkdir -p $out/share/doc
-    cp -R ./ $out/share/doc/${name}
+    mkdir -p $out/share/doc/python33
+    cp -R ./ $out/share/doc/python33/html
   '';
   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 4a2f1aa33b87..8c6b842d0b94 100644
--- a/pkgs/development/interpreters/python/docs/3.3-pdf-a4.nix
+++ b/pkgs/development/interpreters/python/docs/3.3-pdf-a4.nix
@@ -9,8 +9,8 @@ stdenv.mkDerivation rec {
     sha256 = "1y6n13bxlw8a11khy3ynfbz8z0kpf2lvh32dvy8scyw3hrk6wdxp";
   };
   installPhase = ''
-    mkdir -p $out/share/doc
-    cp -R ./ $out/share/doc/${name}
+    mkdir -p $out/share/doc/python33
+    cp -R ./ $out/share/doc/python33/pdf-a4
   '';
   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 d864576bb46c..046abe8f83d7 100644
--- a/pkgs/development/interpreters/python/docs/3.3-pdf-letter.nix
+++ b/pkgs/development/interpreters/python/docs/3.3-pdf-letter.nix
@@ -9,8 +9,8 @@ stdenv.mkDerivation rec {
     sha256 = "0mcj1i47nx81fc9zk1cic4c4p139qjcqlzf4hnnkzvb3jcgy5z6k";
   };
   installPhase = ''
-    mkdir -p $out/share/doc
-    cp -R ./ $out/share/doc/${name}
+    mkdir -p $out/share/doc/python33
+    cp -R ./ $out/share/doc/python33/pdf-letter
   '';
   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 2a922ab299ba..4d99c25bf598 100644
--- a/pkgs/development/interpreters/python/docs/3.3-text.nix
+++ b/pkgs/development/interpreters/python/docs/3.3-text.nix
@@ -9,8 +9,8 @@ stdenv.mkDerivation rec {
     sha256 = "10vk2fixg1aglqmsf89kn98rlirrbhnrk1285vzfbynf2iavxw0n";
   };
   installPhase = ''
-    mkdir -p $out/share/doc
-    cp -R ./ $out/share/doc/${name}
+    mkdir -p $out/share/doc/python33
+    cp -R ./ $out/share/doc/python33/text
   '';
   meta = {
     maintainers = [ lib.maintainers.chaoflow ];
diff --git a/pkgs/development/interpreters/python/docs/template.nix b/pkgs/development/interpreters/python/docs/template.nix
index 388a8f979c5c..cc92f71bc1ea 100644
--- a/pkgs/development/interpreters/python/docs/template.nix
+++ b/pkgs/development/interpreters/python/docs/template.nix
@@ -9,8 +9,8 @@ stdenv.mkDerivation rec {
     sha256 = "SHA";
   };
   installPhase = ''
-    mkdir -p $out/share/doc
-    cp -R ./ $out/share/doc/${name}
+    mkdir -p $out/share/doc/pythonMAJORMINOR
+    cp -R ./ $out/share/doc/pythonMAJORMINOR/TYPE
   '';
   meta = {
     maintainers = [ lib.maintainers.chaoflow ];