diff --git a/pkgs/tools/networking/s3sync/default.nix b/pkgs/tools/networking/s3sync/default.nix
new file mode 100644
index 000000000000..8ed71c345234
--- /dev/null
+++ b/pkgs/tools/networking/s3sync/default.nix
@@ -0,0 +1,29 @@
+{ stdenv, fetchurl, ruby, makeWrapper }:
+
+stdenv.mkDerivation {
+  name = "s3sync-1.2.6";
+  
+  src = fetchurl {
+    url = http://s3.amazonaws.com/ServEdge_pub/s3sync/s3sync.tar.gz; # !!!
+    sha256 = "19467mgym0da0hifhkcbivccdima7gkaw3k8q760ilfbwgwxcn7f";
+  };
+
+  buildInputs = [ makeWrapper ];
+
+  installPhase =
+    ''
+      ensureDir $out/libexec/s3sync
+      cp *.rb $out/libexec/s3sync
+      makeWrapper "${ruby}/bin/ruby $out/libexec/s3sync/s3cmd.rb" $out/bin/s3cmd
+      makeWrapper "${ruby}/bin/ruby $out/libexec/s3sync/s3sync.rb" $out/bin/s3sync
+
+      ensureDir $out/share/doc/s3sync
+      cp README* $out/share/doc/s3sync/
+    ''; # */
+
+  meta = {
+    homepage = http://s3sync.net/;
+    description = "Command-line tools to manipulate Amazon S3 buckets";
+    license = "free-non-copyleft";
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 9098162664a7..158cd9282662 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1491,6 +1491,10 @@ let
     inherit fetchurl stdenv pkgconfig fuse curl expat;
   };
 
+  s3sync = import ../tools/networking/s3sync {
+    inherit fetchurl stdenv ruby makeWrapper;
+  };
+
   sablotron = import ../tools/text/xml/sablotron {
     inherit fetchurl stdenv expat;
   };