diff --git a/pkgs/applications/editors/monodevelop/builder.sh b/pkgs/applications/editors/monodevelop/builder.sh
index ca5e9a772f14..0c69beca856e 100644
--- a/pkgs/applications/editors/monodevelop/builder.sh
+++ b/pkgs/applications/editors/monodevelop/builder.sh
@@ -1,5 +1,8 @@
 . $stdenv/setup
 
 export PERL5LIB=$perlXMLParser/lib/site_perl:$PERL5LIB
+
+export MONO_GAC_PREFIX=$monodoc:$gtksharp
+
 genericBuild
 
diff --git a/pkgs/applications/editors/monodevelop/default.nix b/pkgs/applications/editors/monodevelop/default.nix
index 10b4a8813ba3..e0c0eec21579 100644
--- a/pkgs/applications/editors/monodevelop/default.nix
+++ b/pkgs/applications/editors/monodevelop/default.nix
@@ -1,19 +1,22 @@
-{ stdenv, fetchurl, mono, gtksharp, gtksourceviewsharp
+{ stdenv, fetchurl, file, mono, gtksharp, gtksourceviewsharp
+, gtkmozembedsharp, monodoc
 , perl, perlXMLParser, pkgconfig
-, glib, gconf, gnomevfs, libbonobo}:
+, glib, gtk, gconf, gnomevfs, libbonobo, libglade, libgnome
+}:
 
 stdenv.mkDerivation {
-  name = "monodevelop-0.5.1";
+  name = "monodevelop-0.6-pre2315";
   builder = ./builder.sh;
 
-  src = fetchurl {
-    url = http://www.go-mono.com/archive/1.0.5/monodevelop-0.5.1.tar.gz;
-    md5 = "d89458a2d909da09b2cc1f37e16d8990";
-  };
+  src = /home/eelco/monodevelop-0.6-pre2315.tar.bz2;
 
+  patches = [./prefix.patch];
+  
   buildInputs = [
-    mono gtksharp gtksourceviewsharp perl pkgconfig gnomevfs
-    glib libbonobo gconf
+    file mono gtksharp gtksourceviewsharp perl pkgconfig
+    glib gtk gconf gnomevfs libbonobo libglade libgnome
+    gtkmozembedsharp monodoc
   ];
-  inherit perlXMLParser;
+  
+  inherit perlXMLParser monodoc gtksharp;
 }
diff --git a/pkgs/applications/editors/monodevelop/prefix.patch b/pkgs/applications/editors/monodevelop/prefix.patch
new file mode 100644
index 000000000000..5ab0b4042dd4
--- /dev/null
+++ b/pkgs/applications/editors/monodevelop/prefix.patch
@@ -0,0 +1,44 @@
+diff -rc MonoDevelop-orig/Makefile.in MonoDevelop/Makefile.in
+*** MonoDevelop-orig/Makefile.in	2005-03-09 17:43:58.000000000 +0100
+--- MonoDevelop/Makefile.in	2005-03-09 18:10:20.000000000 +0100
+***************
+*** 298,304 ****
+  # (mkdir ../../build/bin/ hack)
+  SUBDIRS = Core build po Extras
+  bin_SCRIPTS = monodevelop
+! gnome_data = @gnome_prefix@/share
+  desktopdir = $(gnome_data)/applications
+  desktop_DATA = monodevelop.desktop
+  pixmapdir = $(gnome_data)/pixmaps
+--- 298,304 ----
+  # (mkdir ../../build/bin/ hack)
+  SUBDIRS = Core build po Extras
+  bin_SCRIPTS = monodevelop
+! gnome_data = @prefix@/share
+  desktopdir = $(gnome_data)/applications
+  desktop_DATA = monodevelop.desktop
+  pixmapdir = $(gnome_data)/pixmaps
+***************
+*** 809,818 ****
+  all:
+  
+  install-data-hook:
+! 	$(UPDATE_MIME_DB) $(gnome_data)/mime
+  
+  uninstall-hook:
+! 	$(UPDATE_MIME_DB) $(gnome_data)/mime
+  
+  run: runmd
+  
+--- 809,818 ----
+  all:
+  
+  install-data-hook:
+! #	$(UPDATE_MIME_DB) $(gnome_data)/mime
+  
+  uninstall-hook:
+! #	$(UPDATE_MIME_DB) $(gnome_data)/mime
+  
+  run: runmd
+  
+Only in MonoDevelop: Makefile.in~
diff --git a/pkgs/system/all-packages-generic.nix b/pkgs/system/all-packages-generic.nix
index 6766acd3fb95..28d4183f82bb 100644
--- a/pkgs/system/all-packages-generic.nix
+++ b/pkgs/system/all-packages-generic.nix
@@ -148,6 +148,10 @@ rec {
     inherit fetchurl stdenv ncurses;
   };
 
+  file = (import ../tools/misc/file) {
+    inherit fetchurl stdenv;
+  };
+
   screen = (import ../tools/misc/screen) {
     inherit fetchurl stdenv ncurses;
   };
@@ -631,7 +635,14 @@ rec {
     inherit (xlibs) libXft libXrender;
   };
 
-  gtksharp = (import ../development/libraries/gtk-sharp) {
+  gtksharp1 = (import ../development/libraries/gtk-sharp-1) {
+    inherit fetchurl stdenv mono pkgconfig libxml2 monoDLLFixer;
+    inherit (gnome) gtk glib pango libglade libgtkhtml gtkhtml 
+              libgnomecanvas libgnomeui libgnomeprint 
+              libgnomeprintui gconf;
+  };
+
+  gtksharp2 = (import ../development/libraries/gtk-sharp-2) {
     inherit fetchurl stdenv mono pkgconfig libxml2 monoDLLFixer;
     inherit (gnome) gtk glib pango libglade libgtkhtml gtkhtml 
               libgnomecanvas libgnomeui libgnomeprint 
@@ -639,13 +650,15 @@ rec {
   };
 
   gtksourceviewsharp = import ../development/libraries/gtksourceview-sharp {
-    inherit fetchurl stdenv mono pkgconfig gtksharp monoDLLFixer;
+    inherit fetchurl stdenv mono pkgconfig monoDLLFixer;
     inherit (gnome) gtksourceview;
+    gtksharp = gtksharp2;
   };
 
-  geckosharp = import ../development/libraries/gecko-sharp {
-    inherit fetchurl stdenv mono pkgconfig gtksharp monoDLLFixer;
+  gtkmozembedsharp = import ../development/libraries/gtkmozembed-sharp {
+    inherit fetchurl stdenv mono pkgconfig monoDLLFixer;
     inherit (gnome) gtk;
+    gtksharp = gtksharp2;
   };
 
   audiofile = (import ../development/libraries/audiofile) {
@@ -1128,13 +1141,15 @@ rec {
   };
 
   monodevelop = (import ../applications/editors/monodevelop) {
-    inherit fetchurl stdenv mono gtksharp gtksourceviewsharp
-              geckosharp monodoc perl perlXMLParser pkgconfig;
-    inherit (gnome) gnomevfs libbonobo libglade gconf glib gtk;
+    inherit fetchurl stdenv file mono gtksourceviewsharp
+            gtkmozembedsharp monodoc perl perlXMLParser pkgconfig;
+    inherit (gnome) gnomevfs libbonobo libglade libgnome gconf glib gtk;
+    gtksharp = gtksharp2;
   };
 
   monodoc = (import ../applications/editors/monodoc) {
-    inherit fetchurl stdenv mono gtksharp pkgconfig;
+    inherit fetchurl stdenv mono pkgconfig;
+    gtksharp = gtksharp1;
   };
 
   emacs = (import ../applications/editors/emacs) {