diff --git a/pkgs/applications/misc/ikiwiki/default.nix b/pkgs/applications/misc/ikiwiki/default.nix
index b830bc282476..804064617756 100644
--- a/pkgs/applications/misc/ikiwiki/default.nix
+++ b/pkgs/applications/misc/ikiwiki/default.nix
@@ -1,5 +1,7 @@
 {stdenv, fetchurl, perl, gettext, makeWrapper,
-TextMarkdown, URI, HTMLParser, HTMLScrubber, HTMLTemplate, TimeDate}:
+TextMarkdown, URI, HTMLParser, HTMLScrubber, HTMLTemplate, TimeDate,
+CGISession, CGIFormBuilder, DBFile,
+git}:
 
 stdenv.mkDerivation {
   name = "ikiwiki_3.20091009";
@@ -10,19 +12,22 @@ stdenv.mkDerivation {
   };
 
   buildInputs = [ perl TextMarkdown URI HTMLParser HTMLScrubber HTMLTemplate
-    TimeDate gettext makeWrapper ];
+    TimeDate gettext makeWrapper DBFile CGISession CGIFormBuilder ];
 
   patchPhase = ''
     sed -i s@/usr/bin/perl@${perl}/bin/perl@ pm_filter mdwn2man
     sed -i s@/etc/ikiwiki@$out/etc@ Makefile.PL
     sed -i /ENV{PATH}/d ikiwiki.in
+    # State the gcc dependency, and make the cgi use our wrapper
+    sed -i -e 's@$0@"'$out/bin/ikiwiki'"@' \
+        -e "s@'cc'@'${stdenv.gcc}/bin/gcc'@" IkiWiki/Wrapper.pm
   '';
 
   configurePhase = "perl Makefile.PL PREFIX=$out";
 
   postInstall = ''
     for a in $out/bin/*; do
-      wrapProgram $a --suffix PERL5LIB : $PERL5LIB --prefix PATH : ${perl}/bin:$out/bin
+      wrapProgram $a --suffix PERL5LIB : $PERL5LIB --prefix PATH : ${perl}/bin:$out/bin:${git}/bin
     done
   '';
 
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 47c41c2d4128..403fbb8da528 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -7130,7 +7130,8 @@ let
 
   ikiwiki = import ../applications/misc/ikiwiki {
     inherit fetchurl stdenv perl gettext makeWrapper;
-    inherit (perlPackages) TextMarkdown URI HTMLParser HTMLScrubber HTMLTemplate TimeDate;
+    inherit (perlPackages) TextMarkdown URI HTMLParser HTMLScrubber HTMLTemplate TimeDate CGISession DBFile CGIFormBuilder;
+    inherit git; # The RCS should be optional
   };
 
   imagemagick = import ../applications/graphics/ImageMagick {
diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index 268ffa5ed9bf..ec38b674e3e2 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -453,14 +453,23 @@ rec {
     };
   };
 
-  CGISession = buildPerlPackage {
-    name = "CGI-Session-3.95";
+  CGIFormBuilder = buildPerlPackage rec {
+    name = "CGI-FormBuilder-3.0501";
     src = fetchurl {
-      url = mirror://cpan/authors/id/S/SH/SHERZODR/CGI-Session-3.95.tar.gz;
-      md5 = "fe9e46496c7c711c54ca13209ded500b";
+      url = "mirror://cpan/authors/id/N/NW/NWIGER/${name}.tgz";
+      sha256 = "031sgxifl2dq8d4s4d9vnixvqdd3p952k0jrkyqp823k74glps25";
     };
   };
 
+  CGISession = buildPerlPackage rec {
+    name = "CGI-Session-4.42";
+    src = fetchurl {
+      url = "mirror://cpan/authors/id/M/MA/MARKSTOS/${name}.tar.gz";
+      sha256 = "186lqqmfvisw3i74anvnsaqlbp6ww3wyhlsgdpni0mlcnh56h4gw";
+    };
+    buildInputs = [ DBFile ];
+  };
+
   CGISimple = buildPerlPackage {
     name = "CGI-Simple-1.106";
     src = fetchurl {