diff --git a/doc/languages-frameworks/rust.md b/doc/languages-frameworks/rust.md
index 657e1642d2d..f4370d5e706 100644
--- a/doc/languages-frameworks/rust.md
+++ b/doc/languages-frameworks/rust.md
@@ -71,7 +71,7 @@ and create a symbolic link to the file
 in the `~/.config/nixpkgs/overlays` directory.
 
     $ git clone https://github.com/mozilla/nixpkgs-mozilla.git
-    $ mkdir -p ~/.config/nixpkgs/overlays
+    $ mkdir -p  ~/.config/nixpkgs/overlays
     $ ln -s $(pwd)/nixpkgs-mozilla/rust-overlay.nix ~/.config/nixpkgs/overlays/rust-overlay.nix
 
 The latest version can be installed with the following command:
diff --git a/pkgs/development/libraries/tclgpg/default.nix b/pkgs/development/libraries/tclgpg/default.nix
index e156982b6ab..d8bea7f14e3 100644
--- a/pkgs/development/libraries/tclgpg/default.nix
+++ b/pkgs/development/libraries/tclgpg/default.nix
@@ -1,13 +1,13 @@
-{ stdenv, fetchfossil, autoreconfHook, tcl, tcllib, gnupg }:
+{ stdenv, fetchsvn, autoconf, automake, tcl, tcllib, gnupg }:
 
 stdenv.mkDerivation rec {
   name = "tclgpg-${version}";
   version = "1.0pre";
 
-  src = fetchfossil {
-    url = "https://chiselapp.com/user/sgolovan/repository/tclgpg";
-    rev = "c5384e400f4a6efa";
-    sha256 = "5207b1d246fea6d4527e8c044579dae45a2e31eeaa5633f4fa7c7e7b54ec27c5";
+  src = fetchsvn {
+    url = "http://tclgpg.googlecode.com/svn/trunk";
+    rev = 74;
+    sha256 = "5207b1d246fea6d4527e8c044579dae45a2e31eeaa5633f4f97c7e7b54ec27c5";
   };
 
   configureFlags = "--with-tcl=" + tcl + "/lib "
@@ -16,6 +16,7 @@ stdenv.mkDerivation rec {
   preConfigure = ''
     configureFlags="--exec_prefix=$prefix $configureFlags"
     sed -i -e 's|dtplite|TCLLIBPATH="${tcllib}/lib/tcllib${tcllib.version}" &|' Makefile.in
+    autoreconf -vfi
   '';
 
   prePatch = ''
@@ -26,8 +27,7 @@ stdenv.mkDerivation rec {
     libPrefix = "gpg1.0";
   };
 
-  nativeBuildInputs = [ autoreconfHook ];
-  buildInputs = [ tcl tcllib ];
+  buildInputs = [ autoconf automake tcl tcllib ];
 
   meta = {
     homepage = http://code.google.com/p/tclgpg/;