diff --git a/pkgs/development/interpreters/tcl/generic.nix b/pkgs/development/interpreters/tcl/generic.nix
index d01df5ce8be8..eafffba4a34f 100644
--- a/pkgs/development/interpreters/tcl/generic.nix
+++ b/pkgs/development/interpreters/tcl/generic.nix
@@ -10,15 +10,23 @@ stdenv.mkDerivation rec {
 
   inherit src;
 
+  outputs = [ "out" "man" ];
+
+  setOutputFlags = false;
+
   preConfigure = ''
+    # Note: using $out instead of $man to prevent a runtime dependency on $man.
+    configureFlagsArray+=(--mandir=$out/share/man --enable-man-symlinks)
     cd unix
   '';
 
+  enableParallelBuilding = true;
+
   postInstall = ''
     make install-private-headers
     ln -s $out/bin/tclsh${release} $out/bin/tclsh
   '';
-  
+
   meta = with stdenv.lib; {
     description = "The Tcl scription language";
     homepage = http://www.tcl.tk/;
@@ -26,7 +34,7 @@ stdenv.mkDerivation rec {
     platforms = platforms.all;
     maintainers = with maintainers; [ wkennington vrthra ];
   };
-  
+
   passthru = rec {
     inherit release version;
     libPrefix = "tcl${release}";