diff --git a/pkgs/tools/networking/imapsync/default.nix b/pkgs/tools/networking/imapsync/default.nix
index 1418ad63385c..418f8647f8c2 100644
--- a/pkgs/tools/networking/imapsync/default.nix
+++ b/pkgs/tools/networking/imapsync/default.nix
@@ -1,24 +1,30 @@
-{stdenv, fetchurl, perl, openssl, MailIMAPClient}:
+{stdenv, makeWrapper, fetchurl, perl, openssl, perlPackages }:
 
 stdenv.mkDerivation rec {
-  name = "imapsync-1.267";
+  name = "imapsync-1.607";
   src = fetchurl {
-    url = http://www.linux-france.org/prj/imapsync/dist/imapsync-1.267.tgz;
-    sha256 = "0h9np2b4bdfnhn10cqkw66fki26480w0c8m3bxw0p76xkaggywdy";
+    url = "https://fedorahosted.org/released/imapsync/${name}.tgz";
+    sha256 = "0ajgzsil2fa15c3ky8cvpvfz62ymlpmr0lnwvi8ifffclv7k2hvq";
   };
+
   patchPhase = ''
     sed -i -e s@/usr@$out@ Makefile
   '';
 
   postInstall = ''
-    # Add Mail::IMAPClient to the runtime search path.
-    substituteInPlace $out/bin/imapsync --replace '/bin/perl' '/bin/perl -I${MailIMAPClient}/lib/perl5/site_perl';
+    wrapProgram $out/bin/imapsync --set PERL5LIB $PERL5LIB
   '';
-  buildInputs = [perl openssl MailIMAPClient];
 
-  meta = {
-    homepage = "http://www.linux-france.org/prj/imapsync/";
+  nativeBuildInputs = [ makeWrapper ];
+
+  buildInputs = with perlPackages; [ perl openssl MailIMAPClient TermReadKey
+    IOSocketSSL DigestHMAC URI FileCopyRecursive IOTee UnicodeString ];
+
+  meta = with stdenv.lib; {
+    homepage = http://www.linux-france.org/prj/imapsync/;
     description = "Mail folder synchronizer between IMAP servers";
-    license = stdenv.lib.licenses.gpl2Plus;
+    license = licenses.gpl2Plus;
+    platforms = platforms.linux;
+    maintainers = with maintainers; [ pSub ];
   };
 }
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 4c468f1e8e28..f41cc083232d 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1923,9 +1923,7 @@ let
 
   imapproxy = callPackage ../tools/networking/imapproxy { };
 
-  imapsync = callPackage ../tools/networking/imapsync {
-    inherit (perlPackages) MailIMAPClient;
-  };
+  imapsync = callPackage ../tools/networking/imapsync { };
 
   imgurbash = callPackage ../tools/graphics/imgurbash { };