diff --git a/pkgs/applications/editors/monodevelop/builder.sh b/pkgs/applications/editors/monodevelop/builder.sh
index 0c69beca856..bd4b282c7c4 100644
--- a/pkgs/applications/editors/monodevelop/builder.sh
+++ b/pkgs/applications/editors/monodevelop/builder.sh
@@ -1,8 +1,27 @@
 . $stdenv/setup
+. $makeWrapper
 
 export PERL5LIB=$perlXMLParser/lib/site_perl:$PERL5LIB
 
 export MONO_GAC_PREFIX=$monodoc:$gtksharp
 
+postInstall=postInstall
+postInstall() {
+    mv $out/bin $out/bin-orig
+    mkdir $out/bin
+
+    for i in $out/bin-orig/*; do
+        echo "wrapping $(basename $i)"
+        # !!! TODO: figure out the MONO_GAC_PREFIX automatically
+        makeWrapper "$i" "$out/bin/$(basename $i)" \
+            --suffix PATH ':' "$(dirname $(type -p mono))" \
+            --suffix LD_LIBRARY_PATH ':' "$gtksharp/lib" \
+            --suffix MONO_GAC_PREFIX ':' "$gtksharp" \
+            --suffix MONO_GAC_PREFIX ':' "$gtkmozembedsharp" \
+            --suffix MONO_GAC_PREFIX ':' "$gtksourceviewsharp" \
+            --suffix MONO_GAC_PREFIX ':' "$monodoc"
+    done
+}
+
 genericBuild
 
diff --git a/pkgs/applications/editors/monodevelop/default.nix b/pkgs/applications/editors/monodevelop/default.nix
index e0c0eec2157..dcbaa63a96d 100644
--- a/pkgs/applications/editors/monodevelop/default.nix
+++ b/pkgs/applications/editors/monodevelop/default.nix
@@ -10,6 +10,8 @@ stdenv.mkDerivation {
 
   src = /home/eelco/monodevelop-0.6-pre2315.tar.bz2;
 
+  makeWrapper = ../../../build-support/make-wrapper/make-wrapper.sh;
+  
   patches = [./prefix.patch];
   
   buildInputs = [
@@ -18,5 +20,5 @@ stdenv.mkDerivation {
     gtkmozembedsharp monodoc
   ];
   
-  inherit perlXMLParser monodoc gtksharp;
+  inherit perlXMLParser monodoc gtksharp gtkmozembedsharp gtksourceviewsharp;
 }