diff --git a/meta-oe/recipes-connectivity/gammu/gammu/0001-allow-build-with-cmake-4.patch b/meta-oe/recipes-connectivity/gammu/gammu/0001-allow-build-with-cmake-4.patch
deleted file mode 100644
index 5ab63b809f..0000000000
--- a/meta-oe/recipes-connectivity/gammu/gammu/0001-allow-build-with-cmake-4.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-From ea068ac152b9b375be51611ca04d0f833e2f6856 Mon Sep 17 00:00:00 2001
-From: Alper Ak <alperyasinak1@gmail.com>
-Date: Tue, 8 Jul 2025 22:52:11 +0300
-Subject: [PATCH] cmake: Set minimum required version to 3.5 for CMake 4+
- compatibility
-
-Fix:
-
-| CMake Error at CMakeLists.txt:5 (cmake_minimum_required):
-|   Compatibility with CMake < 3.5 has been removed from CMake.
-|
-|   Update the VERSION argument <min> value.  Or, use the <min>...<max> syntax
-|   to tell CMake that the project requires at least <min> but has been updated
-|   to work with policies introduced by <max> or earlier.
-|
-|   Or, add -DCMAKE_POLICY_VERSION_MINIMUM=3.5 to try configuring anyway.
-|
-|
-| -- Configuring incomplete, errors occurred!
-
-Upstream-Status: Pending
-
-Signed-off-by: Alper Ak <alperyasinak1@gmail.com>
----
- CMakeLists.txt | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index d0a79b3..23dba35 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -2,7 +2,7 @@
- # Copyright (c) 2007 - 2018 Michal Cihar
- # vim: expandtab sw=4 ts=4 sts=4:
- 
--cmake_minimum_required (VERSION 3.0)
-+cmake_minimum_required (VERSION 3.5)
- INCLUDE (CMakeForceCompiler)
- 
- project (Gammu C)
--- 
-2.43.0
-
diff --git a/meta-oe/recipes-connectivity/gammu/gammu_1.42.0.bb b/meta-oe/recipes-connectivity/gammu/gammu_1.45.2.bb
similarity index 88%
rename from meta-oe/recipes-connectivity/gammu/gammu_1.42.0.bb
rename to meta-oe/recipes-connectivity/gammu/gammu_1.45.2.bb
index 353ee37f46..d787a75ba4 100644
--- a/meta-oe/recipes-connectivity/gammu/gammu_1.42.0.bb
+++ b/meta-oe/recipes-connectivity/gammu/gammu_1.45.2.bb
@@ -4,15 +4,16 @@ LICENSE = "GPL-2.0-only"
 LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263"
 HOMEPAGE = "https://wammu.eu/"
 
-SRC_URI = "https://dl.cihar.com/${BPN}/releases/${BP}.tar.xz \
+SRC_URI = "https://github.com/gammu/gammu/releases/download/${PV}/Gammu-${PV}.tar.gz \
     file://gammurc \
     file://gammu-smsdrc \
-    file://0001-allow-build-with-cmake-4.patch \
 "
 
-SRC_URI[sha256sum] = "d8f152314d7e4d3d643610d742845e0a016ce97c234ad4b1151574e1b09651ee"
+S = "${UNPACKDIR}/Gammu-${PV}"
 
-UPSTREAM_CHECK_URI = "https://dl.cihar.com/${BPN}/releases"
+SRC_URI[sha256sum] = "92478c1c6d8df193f3d5e36648fd05fc3eff26254034f025cad2a0ffba5aec23"
+
+UPSTREAM_CHECK_URI = "https://github.com/gammu/gammu/releases"
 
 DEPENDS = "cmake-native virtual/libiconv libdbi mysql5 glib-2.0 udev libgudev unixodbc"
 
diff --git a/meta-oe/recipes-connectivity/gammu/python3-gammu/0001-setup.py-StrictVersion-packaging.version.patch b/meta-oe/recipes-connectivity/gammu/python3-gammu/0001-setup.py-StrictVersion-packaging.version.patch
deleted file mode 100644
index 23fe4441dc..0000000000
--- a/meta-oe/recipes-connectivity/gammu/python3-gammu/0001-setup.py-StrictVersion-packaging.version.patch
+++ /dev/null
@@ -1,49 +0,0 @@
-From 96e8f0b2d13e890d9ffff8673f18dcc94290efb2 Mon Sep 17 00:00:00 2001
-From: Tim Orling <tim.orling@konsulko.com>
-Date: Thu, 13 Jan 2022 20:06:33 -0600
-Subject: [PATCH] setup.py: StrictVersion -> packaging.version.*
-
-distutils is deprecated in Python 3.10 and will be removed in Python
-3.12 [1]
-
-The recommended replacement for distutils.version is to use
-packaging.version
-
-StrictVersion can be replaced by packaging.version.Version and helpers
-like packaging.version.parse()
-
-[1] https://www.python.org/dev/peps/pep-0632/
-[2] https://packaging.pypa.io/en/latest/version.html
-
-Upstream-Status: Submitted [https://github.com/gammu/python-gammu/pull/67]
-
-Signed-off-by: Tim Orling <tim.orling@konsulko.com>
----
- setup.py | 6 +++---
- 1 file changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/setup.py b/setup.py
-index a458181..bffb09d 100755
---- a/setup.py
-+++ b/setup.py
-@@ -30,7 +30,7 @@ import os
- import platform
- import subprocess
- import sys
--from distutils.version import StrictVersion
-+from packaging.version import parse, Version
- 
- from setuptools import Extension, setup
- 
-@@ -112,9 +112,9 @@ class GammuConfig:
-         with open(self.config_path(self.path)) as handle:
-             for line in handle:
-                 if line.startswith("#define GAMMU_VERSION "):
--                    version = line.split('"')[1]
-+                    version = parse(line.split('"')[1])
- 
--        if version is None or StrictVersion(version) < StrictVersion(GAMMU_REQUIRED):
-+        if version is None or version < parse(GAMMU_REQUIRED):
-             print("Too old Gammu version, please upgrade!")
-             sys.exit(100)
- 
diff --git a/meta-oe/recipes-connectivity/gammu/python3-gammu_3.2.4.bb b/meta-oe/recipes-connectivity/gammu/python3-gammu_3.5.1.bb
similarity index 67%
rename from meta-oe/recipes-connectivity/gammu/python3-gammu_3.2.4.bb
rename to meta-oe/recipes-connectivity/gammu/python3-gammu_3.5.1.bb
index f8dfa7c926..b312b7eb05 100644
--- a/meta-oe/recipes-connectivity/gammu/python3-gammu_3.2.4.bb
+++ b/meta-oe/recipes-connectivity/gammu/python3-gammu_3.5.1.bb
@@ -6,12 +6,12 @@ LICENSE = "GPL-2.0-or-later"
 LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263"
 
 PYPI_PACKAGE = "python-gammu"
-PYPI_PACKAGE_SDIST = "python-gammu"
+PYPI_PACKAGE_SDIST = "python_gammu"
 
-inherit pypi setuptools3 pkgconfig
+inherit pypi python_setuptools_build_meta pkgconfig
 
-SRC_URI += "file://0001-setup.py-StrictVersion-packaging.version.patch"
-SRC_URI[sha256sum] = "49fc70f01bc192c43ff3ec815e082df5261ea4c8d36a695e977734c4eb4df868"
+SRC_URI += ""
+SRC_URI[sha256sum] = "d6082d685983d898f9ab6b401b96a620857bf337bf07e38b80f6b8ab08fe459a"
 
 DEPENDS += "gammu python3-packaging-native"
 
