diff --git a/pkgs/applications/editors/emacs/modes/cua/builder.sh b/pkgs/applications/editors/emacs/modes/cua/builder.sh
new file mode 100644
index 000000000000..479156fdfa21
--- /dev/null
+++ b/pkgs/applications/editors/emacs/modes/cua/builder.sh
@@ -0,0 +1,4 @@
+. $stdenv/setup
+
+mkdir -p $out/emacs/site-lisp
+cp $src $out/emacs/site-lisp/cua.el
diff --git a/pkgs/applications/editors/emacs/modes/cua/default.nix b/pkgs/applications/editors/emacs/modes/cua/default.nix
new file mode 100644
index 000000000000..f68a5cea2ecb
--- /dev/null
+++ b/pkgs/applications/editors/emacs/modes/cua/default.nix
@@ -0,0 +1,8 @@
+{stdenv, fetchurl}: stdenv.mkDerivation {
+  name = "cua-mode-2.10";
+  builder = ./builder.sh;
+  src = fetchurl {
+    url = http://www.cua.dk/cua.el;
+    md5 = "5bf5e43f5f38c8383868c7c6c5baca09";
+  };
+}
diff --git a/pkgs/applications/editors/emacs/modes/nxml/default.nix b/pkgs/applications/editors/emacs/modes/nxml/default.nix
index d13d22f6ff6a..5bb8e0da12fc 100644
--- a/pkgs/applications/editors/emacs/modes/nxml/default.nix
+++ b/pkgs/applications/editors/emacs/modes/nxml/default.nix
@@ -1,8 +1,8 @@
 {stdenv, fetchurl}: stdenv.mkDerivation {
-  name = "nxml-mode-20040726";
+  name = "nxml-mode-20041004";
   builder = ./builder.sh;
   src = fetchurl {
-    url = http://www.thaiopensource.com/download/nxml-mode-20040726.tar.gz;
-    md5 = "d5c1d6031abfd23cd0da0b79422d9810";
+    url = http://www.thaiopensource.com/download/nxml-mode-20041004.tar.gz;
+    md5 = "ac137024cf337d6f11d8ab278d39b4db";
   };
 }
diff --git a/pkgs/system/all-packages-generic.nix b/pkgs/system/all-packages-generic.nix
index 0db0252c36df..d3fc84c2d00b 100644
--- a/pkgs/system/all-packages-generic.nix
+++ b/pkgs/system/all-packages-generic.nix
@@ -868,6 +868,10 @@ rec {
     inherit fetchurl stdenv;
   };
 
+  cua = (import ../applications/editors/emacs/modes/cua) {
+    inherit fetchurl stdenv;
+  };
+
   vim = (import ../applications/editors/vim) {
     inherit fetchurl stdenv ncurses;
   };