diff --git a/pkgs/development/libraries/languagemachines/ucto.nix b/pkgs/by-name/uc/ucto/package.nix
similarity index 71%
rename from pkgs/development/libraries/languagemachines/ucto.nix
rename to pkgs/by-name/uc/ucto/package.nix
index f9b70f835685..84129a2e3cb0 100644
--- a/pkgs/development/libraries/languagemachines/ucto.nix
+++ b/pkgs/by-name/uc/ucto/package.nix
@@ -1,58 +1,62 @@
 {
   lib,
   stdenv,
-  fetchurl,
-  automake,
-  autoconf,
+  fetchFromGitHub,
+  gitUpdater,
+  autoreconfHook,
   libtool,
   pkg-config,
   autoconf-archive,
   libxml2,
-  icu,
+  icu60,
   bzip2,
   libtar,
-  languageMachines,
+  ticcutils,
+  libfolia,
+  uctodata,
 }:
 
-let
-  release = lib.importJSON ./release-info/LanguageMachines-ucto.json;
-in
-
-stdenv.mkDerivation {
+stdenv.mkDerivation (finalAttrs: {
   pname = "ucto";
-  version = release.version;
-  src = fetchurl {
-    inherit (release) url sha256;
-    name = "ucto-${release.version}.tar.gz";
+  version = "0.9.6";
+
+  src = fetchFromGitHub {
+    owner = "LanguageMachines";
+    repo = "ucto";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-DFQ4ePE3n3zg0mrqUNHzE3Hi81n1IurYjhh6YVAghEE=";
   };
+
   nativeBuildInputs = [
     pkg-config
-    automake
-    autoconf
+    autoreconfHook
   ];
   buildInputs = [
     bzip2
     libtool
     autoconf-archive
-    icu
+    icu60
     libtar
     libxml2
-    languageMachines.ticcutils
-    languageMachines.libfolia
-    languageMachines.uctodata
+    ticcutils
+    libfolia
+    uctodata
     # TODO textcat from libreoffice? Pulls in X11 dependencies?
   ];
-  preConfigure = "sh bootstrap.sh;";
 
   postInstall = ''
     # ucto expects the data files installed in the same prefix
     mkdir -p $out/share/ucto/;
-    for f in ${languageMachines.uctodata}/share/ucto/*; do
+    for f in ${uctodata}/share/ucto/*; do
       echo "Linking $f"
       ln -s $f $out/share/ucto/;
     done;
   '';
 
+  passthru = {
+    updateScript = gitUpdater { rev-prefix = "v"; };
+  };
+
   meta = with lib; {
     description = "Rule-based tokenizer for natural language";
     mainProgram = "ucto";
@@ -68,4 +72,4 @@ stdenv.mkDerivation {
     '';
   };
 
-}
+})
diff --git a/pkgs/development/libraries/languagemachines/packages.nix b/pkgs/development/libraries/languagemachines/packages.nix
index 9e4d150d2dcd..0679880bc50c 100644
--- a/pkgs/development/libraries/languagemachines/packages.nix
+++ b/pkgs/development/libraries/languagemachines/packages.nix
@@ -6,7 +6,7 @@ in
 {
   ticcutils = pkgs.ticcutils;
   libfolia = pkgs.libfolia;
-  ucto = callPackage ./ucto.nix { inherit icu; };
+  ucto = pkgs.ucto;
   uctodata = pkgs.uctodata;
   timbl = callPackage ./timbl.nix { };
   timblserver = callPackage ./timblserver.nix { };
diff --git a/pkgs/development/libraries/languagemachines/release-info/LanguageMachines-ucto.json b/pkgs/development/libraries/languagemachines/release-info/LanguageMachines-ucto.json
deleted file mode 100644
index 9b05cf3e1393..000000000000
--- a/pkgs/development/libraries/languagemachines/release-info/LanguageMachines-ucto.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-  "version": "v0.9.6",
-  "url": "https://api.github.com/repos/LanguageMachines/ucto/tarball/v0.9.6",
-  "sha256": "0fxq4j32g7kp6789xz23651c4v2j7zlz87cshfv9g1xjs7jxns3f"
-}