diff --git a/pkgs/development/libraries/languagemachines/frog.nix b/pkgs/by-name/fr/frog/package.nix
similarity index 75%
rename from pkgs/development/libraries/languagemachines/frog.nix
rename to pkgs/by-name/fr/frog/package.nix
index d9864573c3b5..6c8b52841c9b 100644
--- a/pkgs/development/libraries/languagemachines/frog.nix
+++ b/pkgs/by-name/fr/frog/package.nix
@@ -1,34 +1,38 @@
 {
   lib,
   stdenv,
-  fetchurl,
-  automake,
-  autoconf,
+  fetchFromGitHub,
+  gitUpdater,
+  autoreconfHook,
   bzip2,
   libtar,
   libtool,
   pkg-config,
   autoconf-archive,
   libxml2,
-  icu,
-  languageMachines,
+  icu60,
+  ticcutils,
+  timbl,
+  mbt,
+  libfolia,
+  ucto,
+  frogdata,
 }:
 
-let
-  release = lib.importJSON ./release-info/LanguageMachines-frog.json;
-in
-
-stdenv.mkDerivation {
+stdenv.mkDerivation (finalAttrs: {
   pname = "frog";
-  version = release.version;
-  src = fetchurl {
-    inherit (release) url sha256;
-    name = "frog-v${release.version}.tar.gz";
+  version = "0.13.7";
+
+  src = fetchFromGitHub {
+    owner = "LanguageMachines";
+    repo = "frog";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-khc2uZ/dOtWPTnt/ZD6ILxD386MaZt6fsvNTWTCbs+c=";
   };
+
   nativeBuildInputs = [
     pkg-config
-    automake
-    autoconf
+    autoreconfHook
   ];
   buildInputs = [
     bzip2
@@ -36,28 +40,29 @@ stdenv.mkDerivation {
     libtool
     autoconf-archive
     libxml2
-    icu
-    languageMachines.ticcutils
-    languageMachines.timbl
-    languageMachines.mbt
-    languageMachines.libfolia
-    languageMachines.ucto
-    languageMachines.frogdata
+    icu60
+    ticcutils
+    timbl
+    mbt
+    libfolia
+    ucto
+    frogdata
   ];
 
-  preConfigure = ''
-    sh bootstrap.sh
-  '';
   postInstall = ''
     # frog expects the data files installed in the same prefix
     mkdir -p $out/share/frog/;
-    for f in ${languageMachines.frogdata}/share/frog/*; do
+    for f in ${frogdata}/share/frog/*; do
       ln -s $f $out/share/frog/;
     done;
 
     make check
   '';
 
+  passthru = {
+    updateScript = gitUpdater { rev-prefix = "v"; };
+  };
+
   meta = with lib; {
     description = "Tagger-Lemmatizer-Morphological-Analyzer-Dependency-Parser for Dutch";
     homepage = "https://languagemachines.github.io/frog";
@@ -72,4 +77,4 @@ stdenv.mkDerivation {
     '';
   };
 
-}
+})
diff --git a/pkgs/development/libraries/languagemachines/packages.nix b/pkgs/development/libraries/languagemachines/packages.nix
index 6d369dc78f04..afd9d5c2f1fd 100644
--- a/pkgs/development/libraries/languagemachines/packages.nix
+++ b/pkgs/development/libraries/languagemachines/packages.nix
@@ -11,7 +11,7 @@ in
   timbl = pkgs.timbl;
   timblserver = pkgs.timblserver;
   mbt = pkgs.mbt;
-  frog = callPackage ./frog.nix { inherit icu; };
+  frog = pkgs.frog;
   frogdata = pkgs.frogdata;
 
   test = callPackage ./test.nix { };
diff --git a/pkgs/development/libraries/languagemachines/release-info/LanguageMachines-frog.json b/pkgs/development/libraries/languagemachines/release-info/LanguageMachines-frog.json
deleted file mode 100644
index 55c2ec20a312..000000000000
--- a/pkgs/development/libraries/languagemachines/release-info/LanguageMachines-frog.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-  "version": "v0.13.7",
-  "url": "https://api.github.com/repos/LanguageMachines/frog/tarball/v0.13.7",
-  "sha256": "0swyfi3g862n888qj8v8kd18745hasy0vnc70i9qlv0ji0321bnf"
-}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 7095a4494e79..48e2ab540f29 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -7286,8 +7286,6 @@ with pkgs;
     };
   };
 
-  frog = res.languageMachines.frog;
-
   fontconfig = callPackage ../development/libraries/fontconfig { };
 
   makeFontsConf = callPackage ../development/libraries/fontconfig/make-fonts-conf.nix { };