diff --git a/pkgs/applications/editors/emacs-modes/scala-mode/default.nix b/pkgs/applications/editors/emacs-modes/scala-mode/default.nix
new file mode 100644
index 00000000000..3b6361b9ef7
--- /dev/null
+++ b/pkgs/applications/editors/emacs-modes/scala-mode/default.nix
@@ -0,0 +1,30 @@
+{ fetchsvn, stdenv, emacs }:
+
+let revision = "17339"; in
+stdenv.mkDerivation rec {
+  name = "scala-mode-r${revision}";
+
+  src = fetchsvn {
+    url = "http://lampsvn.epfl.ch/svn-repos/scala/scala-tool-support/trunk/src/emacs";
+    rev = revision;
+    sha256 = "05g3xk2mxkqwdnyvxklnrdyhppkvhfs2fd21blhzbhf474cgqlyh";
+  };
+
+  buildInputs = [ emacs ];
+
+  installPhase =
+    '' ensureDir "$out/share/emacs/site-lisp"
+       cp -v *.el *.elc "$out/share/emacs/site-lisp"
+    '';
+
+  meta = {
+    description = "An Emacs mode for editing Scala code";
+
+    homepage = http://www.scala-lang.org/node/354;
+
+    # non-copyleft, BSD-style
+    license = "permissive";
+
+    maintainers = [ stdenv.lib.maintainers.ludo ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 0ae0e348f0b..612870c053e 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -6878,6 +6878,10 @@ let
     remember = import ../applications/editors/emacs-modes/remember {
       inherit fetchurl stdenv texinfo emacs bbdb;
     };
+
+    scalaMode = import ../applications/editors/emacs-modes/scala-mode {
+      inherit fetchsvn stdenv emacs;
+    };
   });
 
   emacs22Packages = emacsPackages emacs22;