diff --git a/doc/manual/configuration.xml b/doc/manual/configuration.xml
index f631ee68767..fdd8ce80778 100644
--- a/doc/manual/configuration.xml
+++ b/doc/manual/configuration.xml
@@ -168,8 +168,8 @@ In that case, you can do two things.  First, you can clone the Nixpkgs
 repository, add the package to your clone, and (optionally) submit a
 patch or pull request to have it accepted into the main Nixpkgs
 repository.  This is described in detail in the <link
-xlink:href="http://hydra.nixos.org/job/nixpkgs/trunk/tarball/latest/download-by-type/doc/manual">Nixpkgs
-manual</link>.  In short, you clone Nixpkgs:
+xlink:href="http://nixos.org/nixpkgs/manual">Nixpkgs manual</link>.
+In short, you clone Nixpkgs:
 
 <screen>
 $ git clone git://github.com/NixOS/nixpkgs.git
diff --git a/doc/manual/development.xml b/doc/manual/development.xml
index 251df4c84c8..cc5af79dd4e 100644
--- a/doc/manual/development.xml
+++ b/doc/manual/development.xml
@@ -407,7 +407,7 @@ $ nix-build -A config.system.build.manual</screen>
 
 <title>Testing the installer</title>
 
-<para>Building, burning, and 
+<para>Building, burning, and
 booting from an installation CD is rather
 tedious, so here is a quick way to see if the installer works
 properly:
@@ -543,10 +543,10 @@ starting VDE switch for network 1
 
   <para>
     This and other tests are continuously run on <link
-    xlink:href="http://hydra.nixos.org/jobset/nixos/trunk/with-status">the
-    Hydra instance at <literal>nixos.org</literal></link>, which
-    allows developers to be notified of any regressions introduced by
-    a NixOS or Nixpkgs change.
+    xlink:href="http://hydra.nixos.org/jobset/nixos/trunk">the Hydra
+    instance at <literal>nixos.org</literal></link>, which allows
+    developers to be notified of any regressions introduced by a NixOS
+    or Nixpkgs change.
   </para>
 
   <para>
@@ -572,28 +572,27 @@ starting VDE switch for network 1
     <variablelist>
 
       <varlistentry>
-	<term><varname>test</varname></term>
-	<listitem><para>A derivation containing the test log as an HTML file,
-	as seen above, suitable for presentation in the Hydra continuous
-	build system.</para></listitem>
+        <term><varname>test</varname></term>
+        <listitem><para>A derivation containing the test log as an HTML file,
+        as seen above, suitable for presentation in the Hydra continuous
+        build system.</para></listitem>
       </varlistentry>
 
       <varlistentry>
-	<term><varname>report</varname></term>
-	<listitem><para>A derivation containing a code coverage report, with
-	meta-data suitable for Hydra.</para></listitem>
+        <term><varname>report</varname></term>
+        <listitem><para>A derivation containing a code coverage report, with
+        meta-data suitable for Hydra.</para></listitem>
       </varlistentry>
 
       <varlistentry>
-	<term><varname>driver</varname></term>
-	<listitem><para>A derivation containing scripts to run the VM test or
-	interact with the VM network interactively, as seen above.</para>
-	</listitem>
+        <term><varname>driver</varname></term>
+        <listitem><para>A derivation containing scripts to run the VM test or
+        interact with the VM network interactively, as seen above.</para>
+        </listitem>
       </varlistentry>
 
     </variablelist>
   </para>
-    
 
 </section>