diff --git a/packages/kamerka/PKGBUILD b/packages/kamerka/PKGBUILD
index ed93aa892c7..4d00f2aeb38 100644
--- a/packages/kamerka/PKGBUILD
+++ b/packages/kamerka/PKGBUILD
@@ -2,8 +2,9 @@
 # See COPYING for license details.
 
 pkgname=kamerka
-pkgver=41.d5fe254
-pkgrel=5
+pkgver=40.be17620
+pkgrel=1
+epoch=1
 pkgdesc='Build interactive map of cameras from Shodan.'
 arch=('any')
 groups=('blackarch' 'blackarch-recon')
@@ -14,15 +15,9 @@ depends=('python' 'python-geopy' 'python-colorama' 'python-shodan'
          'python-flickrapi' 'python-branca' 'python-google-streetview'
          'python-elasticsearch')
 makedepends=('git')
-source=("git+https://github.com/woj-ciech/$pkgname.git")
+source=("git+https://github.com/woj-ciech/$pkgname.git#commit=be17620618163cf414cda63576f7947e6a7ec44c")
 sha512sums=('SKIP')
 
-pkgver() {
-  cd $pkgname
-
-  echo $(git rev-list --count HEAD).$(git rev-parse --short HEAD)
-}
-
 package() {
   cd $pkgname
 
diff --git a/packages/python-folium/PKGBUILD b/packages/python-folium/PKGBUILD
index ea1d4b92a37..cf1e0e79f8d 100644
--- a/packages/python-folium/PKGBUILD
+++ b/packages/python-folium/PKGBUILD
@@ -4,13 +4,13 @@
 pkgname=python-folium
 _pkgname=folium
 pkgver=0.16.0
-pkgrel=1
+pkgrel=2
 pkgdesc='Make beautiful maps with Leaflet.js & Python.'
 arch=('any')
 url='https://pypi.org/project/folium/#files'
 license=('MIT')
 depends=('python' 'python-branca' 'python-jinja' 'python-numpy'
-         'python-requests')
+         'python-requests' 'python-xyzservices')
 makedepends=('python-setuptools')
 source=("https://files.pythonhosted.org/packages/source/${_pkgname::1}/$_pkgname/$_pkgname-$pkgver.tar.gz")
 sha512sums=('ea96e95b413117d2488b95d78f0aa657b0fcf51dbab370b884ec1bcddc700e55bcdac02abec0ccd67b8b0a70f2f09ad46839ecdeb6e5bcbb076cdec0086a5f11')
diff --git a/packages/python-xyzservices/PKGBUILD b/packages/python-xyzservices/PKGBUILD
new file mode 100644
index 00000000000..55b7b05eb61
--- /dev/null
+++ b/packages/python-xyzservices/PKGBUILD
@@ -0,0 +1,33 @@
+# This file is part of BlackArch Linux ( https://www.blackarch.org/ ).
+# See COPYING for license details.
+
+pkgname=python-xyzservices
+_pkgname=${pkgname#python-}
+pkgver=2024.4.0
+pkgrel=1
+pkgdesc='Provides a repository of available XYZ services offering raster basemap tiles'
+arch=('any')
+url="https://github.com/geopandas/xyzservices"
+license=('BSD-3-Clause')
+depends=('python')
+makedepends=(
+  'python-setuptools-scm'
+  'python-wheel'
+  'python-build'
+  'python-installer'
+)
+source=("$pkgname-$pkgver.tar.gz::$url/releases/download/$pkgver/$_pkgname-$pkgver.tar.gz")
+sha512sums=('2a824ba41570305a47dac5a5b5ee8f2be685c3d1a92b3c88c75538e93b819cef216867e85e6043ec821c8dd5bc34a11b7c4f9cfe9016d4b984eaa0317a20b3fd')
+
+build() {
+  cd "$_pkgname-$pkgver"
+
+  python -m build --wheel --no-isolation
+}
+
+package() {
+  cd "$_pkgname-$pkgver"
+
+  python -m installer --destdir="$pkgdir" dist/*.whl
+  install -Dm644 LICENSE "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
+}