diff --git a/srcpkgs/ClusterSSH/template b/srcpkgs/ClusterSSH/template
index e393691c096..667860ab12c 100644
--- a/srcpkgs/ClusterSSH/template
+++ b/srcpkgs/ClusterSSH/template
@@ -1,9 +1,10 @@
-# Template build file for 'ClusterSSH'.
+# Template file for 'ClusterSSH'
 pkgname=ClusterSSH
-version=4.13
+version=4.13.2.02
 revision=1
+_distver="${version%.*}_${version##*.}"
 noarch=yes
-wrksrc="App-${pkgname}-${version}"
+wrksrc="clusterssh-${_distver}"
 build_style=perl-ModuleBuild
 hostmakedepends="xterm openssh
  perl-CPAN-Changes perl-Module-Build perl-Try-Tiny perl-Tk
@@ -11,9 +12,15 @@ hostmakedepends="xterm openssh
  perl-File-Slurp perl-File-Which  perl-Readonly perl-Test-Differences
  perl-Test-DistManifest  perl-Test-Pod perl-Test-Pod-Coverage perl-Test-Trap"
 depends="xterm openssh perl-Try-Tiny perl-Tk perl-X11-Protocol perl-X11-Protocol-Other perl-Exception-Class"
-short_desc='A tool for making the same change on multiple servers at the same time'
+checkdepends="perl-Sort-Naturally"
+short_desc="Tool for making the same change on multiple servers at the same time"
 maintainer="Enguerrand de Rochefort <voidlinux@rochefort.de>"
-homepage="http://clusterssh.sourceforge.net"
-license="GPL-1, Artistic"
-distfiles="${SOURCEFORGE_SITE}/clusterssh/App-${pkgname}-${version}.tar.gz"
-checksum=eb0df729340054a787429cfcefac79d28cf9013553d01d079ffd8e82fbf35681
+license="Artistic-1.0-Perl, GPL-1.0-or-later"
+homepage="https://github.com/duncs/clusterssh"
+changelog="https://raw.githubusercontent.com/duncs/clusterssh/master/Changes"
+distfiles="https://github.com/duncs/clusterssh/archive/v${_distver}.tar.gz"
+checksum=5c03b706267ddf0b84cf1f1cd6756344859a90a20e3dcc3018820fe142146780
+
+pre_check() {
+	touch README
+}
diff --git a/srcpkgs/ClusterSSH/update b/srcpkgs/ClusterSSH/update
index f4543b71e08..45c768a1027 100644
--- a/srcpkgs/ClusterSSH/update
+++ b/srcpkgs/ClusterSSH/update
@@ -1 +1 @@
-pattern='App-ClusterSSH-\K[\d.]+(?=\.tar\.[gx]z)'
+pattern="clusterssh/archive/[-_a-z]+\K[-_.\d]+(?=\.tar\.gz)"