diff --git a/pkgs/applications/networking/remote/freerdp/unstable.nix b/pkgs/applications/networking/remote/freerdp/unstable.nix
new file mode 100644
index 000000000000..9856be275f0e
--- /dev/null
+++ b/pkgs/applications/networking/remote/freerdp/unstable.nix
@@ -0,0 +1,74 @@
+{ stdenv
+, fetchgit
+, openssl
+, printerSupport ? true, cups
+, pkgconfig
+, zlib
+, libX11
+, libXcursor
+, alsaLib
+, cmake
+, libxkbfile
+, libXinerama
+, libXext
+, directfb
+, cunit
+, xmonadHack ? false
+}:
+
+assert printerSupport -> cups != null;
+
+let rev = "0d412ba629471aeb83d1c39d167d389d8f4262e5"; in
+
+stdenv.mkDerivation (rec {
+  name = "freerdp-1.0pre${rev}";
+
+  src = fetchgit {
+    url = git://github.com/FreeRDP/FreeRDP-1.0.git;
+    inherit rev;
+    sha256 = "e8997677bde3d99c8ae6b6dd85ca2b6a17cca49f7dbd4d460908c969088130e6";
+  };
+
+  buildInputs = [
+    openssl
+    pkgconfig
+    zlib
+    libX11
+    libXcursor
+    libxkbfile
+    libXinerama
+    libXext
+    directfb
+    alsaLib
+    cmake
+    cunit
+  ] ++ stdenv.lib.optional printerSupport cups;
+
+  postUnpack = ''
+    sed -i 's@xf_GetWorkArea(xfi)@///xf_GetWorkArea(xfi)@' git-export/client/X11/xf_monitor.c
+  '';
+
+  cmakeFlags = [ "-DWITH_DIRECTFB=ON" "-DWITH_CUNIT=ON" ];
+
+  meta = {
+    description = "A Remote Desktop Protocol Client";
+
+    longDescription = ''
+      FreeRDP is a client-side implementation of the Remote Desktop Protocol (RDP)
+      following the Microsoft Open Specifications.
+    '';
+
+    homepage = http://www.freerdp.com/;
+
+    license = "free-non-copyleft";
+
+    maintainers = [ stdenv.lib.maintainers.shlevy ];
+  };
+} // (stdenv.lib.optionalAttrs xmonadHack {
+   #xmonad doesn't provide the _NET_WORKAREA atom, so we need to remove the
+   #call that relies on it. This just messes up sizing in non-fullscreen mode
+   postUnpack = ''
+    sed -i 's@xf_GetWorkArea(xfi)@///xf_GetWorkArea(xfi)@' git-export/client/X11/xf_monitor.c
+  '';
+}))
+
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 38d7e04f34b9..afbe4e4f506b 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -6553,6 +6553,8 @@ let
 
   freerdp = callPackage ../applications/networking/remote/freerdp { };
 
+  freerdpUnstable = callPackage ../applications/networking/remote/freerdp/unstable.nix { };
+
   fspot = callPackage ../applications/graphics/f-spot {
     inherit (gnome) libgnome libgnomeui;
     gtksharp = gtksharp1;