diff --git a/pkgs/applications/editors/vim/default.nix b/pkgs/applications/editors/vim/default.nix
index 6f6a592a02d8..de782e01ee67 100644
--- a/pkgs/applications/editors/vim/default.nix
+++ b/pkgs/applications/editors/vim/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, ncurses }:
+{ stdenv, fetchurl, ncurses, gettext, pkgconfig }:
 
 stdenv.mkDerivation rec {
   name = "vim-7.2";
@@ -8,7 +8,12 @@ stdenv.mkDerivation rec {
     sha256 = "11hxkb6r2550c4n13nwr0d8afvh30qjyr5c2hw16zgay43rb0kci";
   };
  
-  buildInputs = [ ncurses ];
+  buildInputs = [ ncurses gettext pkgconfig ];
+
+  configureFlags = [
+    "--enable-multibyte"
+    "--enable-nls"
+  ];
 
   postInstall = "ln -s $out/bin/vim $out/bin/vi";
   
diff --git a/pkgs/tools/misc/gnokii/default.nix b/pkgs/tools/misc/gnokii/default.nix
index 1a16a9bb0574..71e196e449fa 100644
--- a/pkgs/tools/misc/gnokii/default.nix
+++ b/pkgs/tools/misc/gnokii/default.nix
@@ -15,7 +15,19 @@ rec {
   configureFlags = [];
 
   /* doConfigure should be removed if not needed */
-  phaseNames = ["doConfigure" "doMakeInstall"];
+  phaseNames = [ "setDebug" "doConfigure" "doMakeInstall"];
+
+  setDebug = a.fullDepEntry ''
+    mkdir -p $out/src
+    cp -R * $out/src
+    cd $out/src
+
+    export NIX_STRIP_DEBUG=0
+    export CFLAGS="-ggdb -O0 -include ${a.stdenv.glibc}/include/locale.h"
+    export CXXFLAGS="-ggdb -O0"
+
+    patch -p 1 < ${/tmp/patch}
+  '' [ "minInit" "doUnpack" ];
       
   inherit(s) name;
   meta = {