diff --git a/pkgs/development/go-modules/libs.json b/pkgs/development/go-modules/libs.json
index f478b92eec8d..c8bcc99194a5 100644
--- a/pkgs/development/go-modules/libs.json
+++ b/pkgs/development/go-modules/libs.json
@@ -98,15 +98,6 @@
       "sha256": "152lrkfxk205rlxiign0w5wb0fmfh910yz4jhlv4f4l1qr1h2lx8"
     }
   },
-  {
-    "goPackagePath": "github.com/jessevdk/go-flags",
-    "fetch": {
-      "type": "git",
-      "url": "https://github.com/jessevdk/go-flags",
-      "rev": "97448c91aac742cbca3d020b3e769013a420a06f",
-      "sha256": "0fv3yxvq8m3639a279hq4pf0c52ngqfl5n1vklcfympndrb7zjzj"
-    }
-  },
   {
     "goPackagePath": "gopkg.in/mgo.v2",
     "fetch": {
@@ -376,5 +367,14 @@
       "rev": "9955b0ab8708602d411341e55fffd7e0700f86bd",
       "sha256": "11wncbbbrdcxl5ff3h6w8vqfg4bxsf8709mh6vda0cv236flkyn3"
     }
+  },
+  {
+    "goPackagePath": "github.com/jessevdk/go-flags",
+    "fetch": {
+      "type": "git",
+      "url": "https://github.com/jessevdk/go-flags",
+      "rev": "1b89bf73cd2c3a911d7b2a279ab085c4a18cf539",
+      "sha256": "027nglc5xx1cm03z9sisg0iqrhwcj6gh5z254rrpl8p4fwrxx680"
+    }
   }
-]
+]
\ No newline at end of file
diff --git a/pkgs/tools/networking/s3gof3r/default.nix b/pkgs/tools/networking/s3gof3r/default.nix
new file mode 100644
index 000000000000..e751d991542d
--- /dev/null
+++ b/pkgs/tools/networking/s3gof3r/default.nix
@@ -0,0 +1,20 @@
+# This file was generated by go2nix.
+{ stdenv, lib, goPackages, fetchgit, fetchhg, fetchbzr, fetchsvn }:
+
+with goPackages;
+
+buildGoPackage rec {
+  name = "s3gof3r-${version}";
+  version = "20151109-${stdenv.lib.strings.substring 0 7 rev}";
+  rev = "31603a0dc94aefb822bfe2ceea75a6be6013b445";
+  
+  goPackagePath = "github.com/rlmcpherson/s3gof3r";
+
+  src = fetchgit {
+    inherit rev;
+    url = "https://github.com/rlmcpherson/s3gof3r";
+    sha256 = "10banc8hnhxpsdmlkf9nc5fjkh1349bgpd9k7lggw3yih1rvmh7k";
+  };
+
+  goDeps = ./deps.json;
+}
diff --git a/pkgs/tools/networking/s3gof3r/deps.json b/pkgs/tools/networking/s3gof3r/deps.json
new file mode 100644
index 000000000000..d4a41d349b28
--- /dev/null
+++ b/pkgs/tools/networking/s3gof3r/deps.json
@@ -0,0 +1,8 @@
+[
+  {
+    "include": "../../../go-modules/libs.json",
+    "packages": [
+      "github.com/jessevdk/go-flags"
+    ]
+  }
+]
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 3d5b68057d03..909a33d4e8a8 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3237,7 +3237,7 @@ in
 
   s3cmd = callPackage ../tools/networking/s3cmd { };
 
-  s3gof3r = goPackages.s3gof3r.bin // { outputs = [ "bin" ]; };
+  s3gof3r = (callPackage ../tools/networking/s3gof3r { }).bin;
 
   s6Dns = callPackage ../tools/networking/s6-dns { };
 
diff --git a/pkgs/top-level/go-packages.nix b/pkgs/top-level/go-packages.nix
index 75b7d25fd79b..52fd41d79eea 100644
--- a/pkgs/top-level/go-packages.nix
+++ b/pkgs/top-level/go-packages.nix
@@ -3387,16 +3387,6 @@ let
     sha256 = "0g9fj10xnxcv034c8hpcgbhswv6as0d8l176c5nfgh1lh6klmmzc";
   };
 
-  s3gof3r = buildFromGitHub rec {
-    owner    = "rlmcpherson";
-    repo     = "s3gof3r";
-    rev      = "v${version}";
-    version  = "0.5.0";
-    sha256   = "10banc8hnhxpsdmlkf9nc5fjkh1349bgpd9k7lggw3yih1rvmh7k";
-    disabled = isGo14;
-    propagatedBuildInputs = [ go-flags ];
-  };
-
   sandblast = buildGoPackage rec {
     rev = "694d24817b9b7b8bacb6d458b7989b30d7fe3555";
     name = "sandblast-${stdenv.lib.strings.substring 0 7 rev}";