diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index 0f0797964509..90d0c22036bc 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -9420,6 +9420,13 @@
     githubId = 2881922;
     name = "Francis St-Amour";
   };
+  fstracke = {
+    email = "fritz.stracke@rwth-aachen.de";
+    github = "fstracke";
+    githubId = 31512703;
+    name = "Fritz Stracke";
+    keys = [ { fingerprint = "7A9D 6DB2 0C5A AA55 7838  EEE6 B8CA 2D9A D8F0 506F"; } ];
+  };
   ftrvxmtrx = {
     email = "ftrvxmtrx@gmail.com";
     github = "ftrvxmtrx";
diff --git a/pkgs/by-name/ha/hamlib_4/package.nix b/pkgs/by-name/ha/hamlib_4/package.nix
index 1eade7399d8e..27d07cf1fbdd 100644
--- a/pkgs/by-name/ha/hamlib_4/package.nix
+++ b/pkgs/by-name/ha/hamlib_4/package.nix
@@ -1,9 +1,10 @@
 {
   lib,
   stdenv,
-  fetchurl,
+  fetchFromGitHub,
   perl,
   swig,
+  autoreconfHook,
   gd,
   ncurses,
   python311,
@@ -23,11 +24,13 @@ let
 in
 stdenv.mkDerivation (finalAttrs: {
   pname = "hamlib";
-  version = "4.6.2";
+  version = "4.7.2";
 
-  src = fetchurl {
-    url = "mirror://sourceforge/hamlib/hamlib-${finalAttrs.version}.tar.gz";
-    hash = "sha256-sqxz9E3RFh6V/e5slSdhRHV2R7+S1/2zae4v5B7Ueug=";
+  src = fetchFromGitHub {
+    owner = "Hamlib";
+    repo = "Hamlib";
+    tag = finalAttrs.version;
+    hash = "sha256-t1GgCYH+AJE5UZKQu+9uqx7fJDv4zuT0OzWxicZFfdQ=";
   };
 
   strictDeps = true;
@@ -36,6 +39,7 @@ stdenv.mkDerivation (finalAttrs: {
     swig
     pkg-config
     libtool
+    autoreconfHook
   ]
   ++ lib.optionals pythonBindings [ python3 ]
   ++ lib.optionals tclBindings [ tcl ]
@@ -78,7 +82,10 @@ stdenv.mkDerivation (finalAttrs: {
       lgpl2Plus
     ];
     homepage = "https://hamlib.sourceforge.net";
-    maintainers = with lib.maintainers; [ relrod ];
+    maintainers = with lib.maintainers; [
+      relrod
+      fstracke
+    ];
     platforms = with lib.platforms; unix;
   };
 })
diff --git a/pkgs/by-name/ws/wsjtz/package.nix b/pkgs/by-name/ws/wsjtz/package.nix
index 715b1b60f03b..46cb703b9ee4 100644
--- a/pkgs/by-name/ws/wsjtz/package.nix
+++ b/pkgs/by-name/ws/wsjtz/package.nix
@@ -1,33 +1,37 @@
 {
   lib,
-  fetchzip,
+  fetchFromGitHub,
   wsjtx,
 }:
 
 wsjtx.overrideAttrs (
   finalAttrs: old: {
     pname = "wsjtz";
-    version = "2.7.0-rc7-1.48";
+    version = "2.0.18";
 
-    src = fetchzip {
-      url = "mirror://sourceforge/wsjt-z/Source/wsjtz-${finalAttrs.version}.zip";
-      hash = "sha256-8PHbBlF0MtIgLn4HCFkbGivy8vBwg7NbvjMLaRj+4nI=";
+    src = fetchFromGitHub {
+      owner = "sq9fve";
+      repo = "wsjt-z";
+      tag = "v${finalAttrs.version}";
+      hash = "sha256-YxO4pSdKKeO0Ye7Ay/0gdjPvceLbC5eMQk1ZBh1ZHCw=";
     };
 
     postInstall = ''
       mv $out/bin/wsjtx $out/bin/wsjtz
       mv $out/bin/wsjtx_app_version $out/bin/wsjtz_app_version
-    '';
 
-    # Source isn't available in Git.
-    passthru = lib.removeAttrs old.passthru [ "updateScript" ];
+      substituteInPlace $out/share/applications/wsjtx.desktop \
+        --replace-fail "Exec=wsjtx" "Exec=wsjtz" \
+        --replace-fail "Name=wsjtx" "Name=wsjtz"
+    '';
 
     meta = {
       description = "WSJT-X fork, primarily focused on automation and enhanced functionality";
-      homepage = "https://sourceforge.net/projects/wsjt-z/";
+      homepage = "https://github.com/sq9fve/wsjt-z";
       license = lib.licenses.gpl3Only;
       platforms = lib.platforms.linux;
       maintainers = with lib.maintainers; [
+        Cryolitia
         scd31
       ];
       mainProgram = "wsjtz";