diff --git a/perl/PKGBUILD b/perl/PKGBUILD
index ed03a454..0de857d1 100644
--- a/perl/PKGBUILD
+++ b/perl/PKGBUILD
@@ -1,15 +1,14 @@
 # Maintainer: Alexey Pavlov <Alexpux@gmail.com>
 
-pkgname=perl
+pkgbase=perl
+pkgname=('perl' 'perl-devel')
 pkgver=5.32.0
 _gccver=9.3.0
-pkgrel=1
+pkgrel=2
 pkgdesc="A highly capable, feature-rich programming language"
 arch=(i686 x86_64)
 license=('GPL')
 url="https://www.perl.org/"
-groups=('base-devel')
-depends=('db' 'gdbm' 'libcrypt' 'coreutils' 'sh')
 makedepends=('libdb-devel' 'libgdbm-devel' 'libcrypt-devel')
 source=(https://www.cpan.org/src/5.0/perl-${pkgver}.tar.xz
         perlbin.sh
@@ -25,8 +24,87 @@ source=(https://www.cpan.org/src/5.0/perl-${pkgver}.tar.xz
         perl-cygwin-dont-add-fortify-source.patch
         regen-skip.diff)
 options=('makeflags' '!purge' 'emptydirs')
+sha256sums=('6f436b447cf56d22464f980fac1916e707a040e96d52172984c5d184c09b859b'
+            '91bf8a45a3f04f51fe0eca146a71e278d41dbde19ba60dabc1e41c4639477c07'
+            '478a52dc440d5ca324f4c95238b39cc8c90d5d7d8d5601fa085ffef79fea04f4'
+            '11ce66bcf4803b0bf27179a32ce53f41bcdfa967c4c0d54ac103dbc4951d18a3'
+            'fe91f1de38af525cb82503feef553b71299c52ea52c01b1959143f48f4051ffa'
+            '9745883a27edc99ac0a90cbbf930c2a532085719dc1eaf801b2dda29f7d475e9'
+            'ecc088b7c69676179bf149e53d558e49645e03aff33f041ce35ec353865bedcc'
+            '2520356a2ffca851207a38adeb8fd0af4d87bcaa20c6ebf5185295ba588fac58'
+            '48083033bce0d57d3b41d6febe3db824d00751b6f86f65380abc773837c23ede'
+            '2715c8dd69d6e72d04a269844ccab0a4cae77263448b2af9e2e3289929a0982f'
+            'c07a4bd0d01d5eb63cda8fca0333a58fac2a230438b0ac4ba41f53861fd5d998'
+            '0140bdd899b424732e3cd7c18ae1b7639535a3b28fb13589c5cf3c78eac988ef'
+            'f2f28c33743f767e98a5c6b2666a838ed12590d913b02b2baf3258d6c175dc06')
+
+prepare() {
+  chmod -R 0666 ${srcdir}/${pkgname}-${pkgver}
+  cd ${srcdir}/${pkgname}-${pkgver}
+
+  patch -p2 -i ${srcdir}/perl.cygwin-auto-image-base.patch
+  patch -p1 -i ${srcdir}/perl.cygwin-hints.patch
+  patch -p2 -i ${srcdir}/perl.cygwin-Configure-libsearch.patch
+  patch -p2 -i ${srcdir}/perl.cygwin-Configure-libpth.patch
+  patch -p1 -i ${srcdir}/perl.cygwin-Win32.patch
+
+  patch -p1 -i ${srcdir}/perl-5.32.0-msys2.patch
+  patch -p1 -i ${srcdir}/perl-cygwin-dont-add-fortify-source.patch
+
+  #debian
+  patch -p1 -i ${srcdir}/regen-skip.diff
+
+  cat > Policy.sh <<_EOF
+#!/bin/sh
+d_readlink='undef'
+_EOF
+
+sed -ri '/\s+$/s///' $(find . -type f | grep -vE ".aux$|.ico$|.tgz$|.tbz$|.tar$|.utf$|.enc$|.patch$|.pub$|.xml$|.t$|laozi38p.pod$|opnames.h$|perlguts.pod$|trailing-space$")
+
+  # test broken with gdbm 1.15. See: https://rt.perl.org/Public/Bug/Display.html?id=133295
+  sed -i 's|BEGIN {|BEGIN { plan(skip_all => "fatal test unsupported with gdbm 1.15");|' ext/GDBM_File/t/fatal.t
+
+}
+
+build() {
+  cd ${srcdir}/${pkgname}-${pkgver}
+
+  ./Configure -des -Dusethreads \
+    -Doptimize="${CFLAGS}" \
+    -Dprefix=/usr \
+    -Dvendorprefix=/usr \
+    -Dprivlib=/usr/share/perl5/core_perl \
+    -Darchlib=/usr/lib/perl5/core_perl \
+    -Dsitelib=/usr/share/perl5/site_perl \
+    -Dsitearch=/usr/lib/perl5/site_perl \
+    -Dvendorlib=/usr/share/perl5/vendor_perl \
+    -Dvendorarch=/usr/lib/perl5/vendor_perl \
+    -Dscriptdir=/usr/bin/core_perl \
+    -Dsitescript=/usr/bin/site_perl \
+    -Dvendorscript=/usr/bin/vendor_perl \
+    -Dinc_version_list=none \
+    -Dman1ext=1perl -Dman3ext=3perl \
+    -Darchname=${ARCH}-msys-threads \
+    -Dmyarchname=${ARCH}-msys \
+    -Dlibperl=msys-perl5_32.dll \
+    -Dcc=gcc -Dld=g++ \
+    -Accflags="$CFLAGS -fwrapv"
+
+  LC_ALL=C make
+}
+
+check() {
+  cd ${srcdir}/${pkgname}-${pkgver}
+  TEST_JOBS=$(echo $MAKEFLAGS | sed 's/.*-j\([0-9][0-9]*\).*/\1/') make test_harness || true
+  #make test
+}
+
+package_perl() {
+  groups=('base-devel')
+  depends=('db' 'gdbm' 'libcrypt' 'coreutils' 'sh')
 # NOTE: This array is automatically generated by `./patchprov`.
 #       If you want to add entries, do so in the next array.
+# NOTE2: './patchprov' expects this provides= to be hard left
 provides=('perl-Archive-Tar=2.36'
           'perl-Attribute-Handlers=1.01'
           'perl-autodie=2.29'
@@ -141,85 +219,10 @@ provides=('perl-Archive-Tar=2.36'
           'perl-Unicode-Normalize=1.27'
           'perl-version=0.9924'
           'perl-XSLoader=0.30')
-# Add your own provides here
-provides=(${provides[@]})
-replaces=('perl-Scalar-List-Utils')
-sha256sums=('6f436b447cf56d22464f980fac1916e707a040e96d52172984c5d184c09b859b'
-            '91bf8a45a3f04f51fe0eca146a71e278d41dbde19ba60dabc1e41c4639477c07'
-            '478a52dc440d5ca324f4c95238b39cc8c90d5d7d8d5601fa085ffef79fea04f4'
-            '11ce66bcf4803b0bf27179a32ce53f41bcdfa967c4c0d54ac103dbc4951d18a3'
-            'fe91f1de38af525cb82503feef553b71299c52ea52c01b1959143f48f4051ffa'
-            '9745883a27edc99ac0a90cbbf930c2a532085719dc1eaf801b2dda29f7d475e9'
-            'ecc088b7c69676179bf149e53d558e49645e03aff33f041ce35ec353865bedcc'
-            '2520356a2ffca851207a38adeb8fd0af4d87bcaa20c6ebf5185295ba588fac58'
-            '48083033bce0d57d3b41d6febe3db824d00751b6f86f65380abc773837c23ede'
-            '2715c8dd69d6e72d04a269844ccab0a4cae77263448b2af9e2e3289929a0982f'
-            'c07a4bd0d01d5eb63cda8fca0333a58fac2a230438b0ac4ba41f53861fd5d998'
-            '0140bdd899b424732e3cd7c18ae1b7639535a3b28fb13589c5cf3c78eac988ef'
-            'f2f28c33743f767e98a5c6b2666a838ed12590d913b02b2baf3258d6c175dc06')
+  # Add your own provides here
+  provides=(${provides[@]})
+  replaces=('perl-Scalar-List-Utils')
 
-prepare() {
-  chmod -R 0666 ${srcdir}/${pkgname}-${pkgver}
-  cd ${srcdir}/${pkgname}-${pkgver}
-
-  patch -p2 -i ${srcdir}/perl.cygwin-auto-image-base.patch
-  patch -p1 -i ${srcdir}/perl.cygwin-hints.patch
-  patch -p2 -i ${srcdir}/perl.cygwin-Configure-libsearch.patch
-  patch -p2 -i ${srcdir}/perl.cygwin-Configure-libpth.patch
-  patch -p1 -i ${srcdir}/perl.cygwin-Win32.patch
-
-  patch -p1 -i ${srcdir}/perl-5.32.0-msys2.patch
-  patch -p1 -i ${srcdir}/perl-cygwin-dont-add-fortify-source.patch
-
-  #debian
-  patch -p1 -i ${srcdir}/regen-skip.diff
-
-  cat > Policy.sh <<_EOF
-#!/bin/sh
-d_readlink='undef'
-_EOF
-
-sed -ri '/\s+$/s///' $(find . -type f | grep -vE ".aux$|.ico$|.tgz$|.tbz$|.tar$|.utf$|.enc$|.patch$|.pub$|.xml$|.t$|laozi38p.pod$|opnames.h$|perlguts.pod$|trailing-space$")
-
-  # test broken with gdbm 1.15. See: https://rt.perl.org/Public/Bug/Display.html?id=133295
-  sed -i 's|BEGIN {|BEGIN { plan(skip_all => "fatal test unsupported with gdbm 1.15");|' ext/GDBM_File/t/fatal.t
-
-}
-
-build() {
-  cd ${srcdir}/${pkgname}-${pkgver}
-
-  ./Configure -des -Dusethreads \
-    -Doptimize="${CFLAGS}" \
-    -Dprefix=/usr \
-    -Dvendorprefix=/usr \
-    -Dprivlib=/usr/share/perl5/core_perl \
-    -Darchlib=/usr/lib/perl5/core_perl \
-    -Dsitelib=/usr/share/perl5/site_perl \
-    -Dsitearch=/usr/lib/perl5/site_perl \
-    -Dvendorlib=/usr/share/perl5/vendor_perl \
-    -Dvendorarch=/usr/lib/perl5/vendor_perl \
-    -Dscriptdir=/usr/bin/core_perl \
-    -Dsitescript=/usr/bin/site_perl \
-    -Dvendorscript=/usr/bin/vendor_perl \
-    -Dinc_version_list=none \
-    -Dman1ext=1perl -Dman3ext=3perl \
-    -Darchname=${ARCH}-msys-threads \
-    -Dmyarchname=${ARCH}-msys \
-    -Dlibperl=msys-perl5_32.dll \
-    -Dcc=gcc -Dld=g++ \
-    -Accflags="$CFLAGS -fwrapv"
-
-  LC_ALL=C make
-}
-
-check() {
-  cd ${srcdir}/${pkgname}-${pkgver}
-  TEST_JOBS=$(echo $MAKEFLAGS | sed 's/.*-j\([0-9][0-9]*\).*/\1/') make test_harness || true
-  #make test
-}
-
-package() {
   cd ${srcdir}/${pkgname}-${pkgver}
   make DESTDIR="${pkgdir}" V=1 install
 
@@ -285,3 +288,8 @@ package() {
                   ${pkgdir}/usr/lib/perl5/core_perl/auto/Win32CORE/Win32CORE.a
 
 }
+
+package_perl-devel() {
+  pkgdesc="Perl headers and dev dependencies"
+  depends=("perl=${pkgver}" 'libcrypt-devel')
+}