diff --git a/PKGBUILD b/PKGBUILD
index 20c2e01..2ee6a56 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -7,7 +7,7 @@
 pkgname=perl
 pkgver=5.36.1
 _baseversion="${pkgver%.*}"
-pkgrel=1
+pkgrel=2
 pkgdesc="A highly capable, feature-rich programming language"
 arch=(x86_64)
 license=('GPL' 'PerlArtistic')
@@ -132,6 +132,7 @@ provides=('perl-archive-tar=2.40'
 # Add your own provides here
 provides=("${provides[@]}")
 source=(https://www.cpan.org/src/5.0/perl-${pkgver}.tar.xz
+        https://github.com/andk/cpanpm/commit/9c98370287.patch
         config.over
         db_config.in
         perlbin.sh
@@ -141,6 +142,7 @@ source=(https://www.cpan.org/src/5.0/perl-${pkgver}.tar.xz
         detect-old-perl-modules.hook)
 options=('makeflags' '!purge' 'emptydirs')
 sha512sums=('8d1ec654c59d078bfc477f11c9526233199a85e4d4f6f5a55bf9eb7802cd355189c669cc6785d2d5e741c1de4d740b7a0cfd3c0198122586a07ac7f527fb14af'
+            '59b90a61efb0ddc81ef2cea2b2b845f85b09402ae1778ea8de64a99b9e4274cca73a00dd9fe9879bcca7447929d23e10ce65dc1e551452cbe68792d08d1bce21'
             '1c924b5bf7413d097f62638a574d7decf36d98598b84cdb5fb31ff633b6f953371e14b004a2558a1a0b74b6b60b90b481af0f68555a49208fe6b226381fed79f'
             '444e03c9a6040c1b4f19872d849e93322ffad40262339edb0b7961d2de47a161f01074f2d5418a057fd62e900ff1fbf5ea8ba4e3384aaa86fda84c80d0550a2b'
             '6ed5bc6dbdc47bc7f4c0fedbe18deaf35ab02a2e6700988beb545954bb1d0fe20ff1a4de39d6d9fc882ef1741f7bf6d85ba165d0cd8dc0d9939b789c894f48a1'
@@ -151,16 +153,19 @@ sha512sums=('8d1ec654c59d078bfc477f11c9526233199a85e4d4f6f5a55bf9eb7802cd355189c
 # https://www.cpan.org/src/5.0/perl-$pkgver.tar.xz.sha256.txt
 
 prepare() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
+  cd "${pkgname}-${pkgver}"
 
   # reproducible patchlevel_date
   [ -n "${SOURCE_DATE_EPOCH}" ] && touch -h -d @$SOURCE_DATE_EPOCH patchlevel.h
   
   cp -f ../db_config.in ./cpan/DB_File/config.in
+
+  # CVE-2023-31484
+  patch -Np1 -d cpan/CPAN -i "${srcdir}"/9c98370287.patch
 }
 
 build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
+  cd "${pkgname}-${pkgver}"
 
   if [ "${CARCH}" = "x86_64" ]; then
     # for x86_64
@@ -192,13 +197,13 @@ build() {
 }
 
 check() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
+  cd "${pkgname}-${pkgver}"
 #  TEST_JOBS=$(echo "$MAKEFLAGS" | sed 's/.*-j\([0-9][0-9]*\).*/\1/') make test_harness
   make test
 }
 
 package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
+  cd "${pkgname}-${pkgver}"
   make DESTDIR="$pkgdir" install
 
   ### Perl Settings ###