diff --git a/pkgs/servers/elasticmq/default.nix b/pkgs/servers/elasticmq/default.nix
new file mode 100644
index 00000000000..3d0324775f8
--- /dev/null
+++ b/pkgs/servers/elasticmq/default.nix
@@ -0,0 +1,39 @@
+{ stdenv, fetchurl, jre, makeWrapper, which }:
+
+stdenv.mkDerivation rec {
+  name = "elasticmq-0.5";
+
+  src = fetchurl {
+    url = "https://github.com/downloads/adamw/elasticmq/${name}.tar.gz";
+    sha256 = "1zpv3vzairprh4x9fia82qqr14kf5hpxq1r90mn4ww7ighbv9pf1";
+  };
+
+  buildInputs = [ makeWrapper ];
+
+  installPhase =
+    ''
+      mkdir -p $out/bin
+      cp -prd lib conf $out/
+      
+      cp bin/run.sh $out/bin/elasticmq
+      substituteInPlace $out/bin/elasticmq --replace '-DBASEDIR=$BASEDIR' '-DBASEDIR=''${ELASTICMQ_DATA_PREFIX:-.}'
+
+      wrapProgram $out/bin/elasticmq --prefix PATH : "${which}/bin:${jre}/bin"
+    '';
+
+  meta = {
+    homepage = https://github.com/adamw/elasticmq;
+    description = "Message queueing system with Java, Scala and Amazon SQS-compatible interfaces";
+    longDescription =
+      ''
+        ElasticMQ is a message queueing system with Java, Scala and
+        Amazon SQS-compatible interfaces.  You should set the
+        environment ELASTICMQ_DATA_PREFIX to a writable directory
+        where ElasticMQ will store its data and log files.  It also
+        looks for its configuration file in
+        $ELASTICMQ_DATA_PREFIX/conf/Default.scala.  You can use the
+        Default.scala included in the distribution as a template.
+      '';
+    license = "APLv2";
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index e8f167ff193..2acb2bb9ed6 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -5133,6 +5133,10 @@ let
     inherit openssl libtool perl;
   };
 
+  couchdb = callPackage ../servers/http/couchdb {
+    spidermonkey = spidermonkey_185;
+  };
+
   dico = callPackage ../servers/dico { };
 
   dict = callPackage ../servers/dict { };
@@ -5152,9 +5156,7 @@ let
 
   ejabberd = callPackage ../servers/xmpp/ejabberd { };
 
-  couchdb = callPackage ../servers/http/couchdb {
-    spidermonkey = spidermonkey_185;
-  };
+  elasticmq = callPackage ../servers/elasticmq { };
 
   felix = callPackage ../servers/felix { };