diff --git a/.SRCINFO b/.SRCINFO
index 871c72d1367e7..1c8c1d8a881e9 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,17 +1,20 @@
 pkgbase = perl-moosex-nonmoose
 	pkgdesc = easy subclassing of non-Moose classes
 	pkgver = 0.27
-	pkgrel = 3
-	url = https://metacpan.org/dist/MooseX-NonMoose
+	pkgrel = 4
+	url = https://metacpan.org/release/PLICEASE/MooseX-NonMoose-0.27
 	arch = any
 	license = Artistic-1.0-Perl OR GPL-1.0-or-later
 	checkdepends = perl-base
 	checkdepends = perl-moose
 	checkdepends = perl-test-fatal
+	checkdepends = perl-test-simple
+	checkdepends = perl>=5.8.0
 	makedepends = perl-extutils-makemaker
+	makedepends = perl>=5.6.0
 	depends = perl-module-runtime
-	depends = perl-moose>=2.0
-	depends = perl-scalar-list-utils>=1.33
+	depends = perl-moose
+	depends = perl-scalar-list-utils
 	depends = perl-try-tiny
 	depends = perl>=5.8.0
 	options = !emptydirs
diff --git a/PKGBUILD b/PKGBUILD
index f3f96071f291f..830a2ed8d5f1b 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,34 +2,40 @@
 # Contributor: John D Jones III <jnbek1972 -_AT_- g m a i l -_Dot_- com>
 # Contributor: Harley Pig <archlinux@harleypig.com>
 
-_dist='MooseX-NonMoose'
-pkgname='perl-moosex-nonmoose'
-pkgver=0.27
-pkgrel=3
+_dist=MooseX-NonMoose
+_ver=0.27
+pkgname=perl-${_dist,,}
+pkgver=${_ver#v}
+pkgrel=4
 pkgdesc='easy subclassing of non-Moose classes'
 arch=('any')
-url="https://metacpan.org/dist/$_dist"
+url=https://metacpan.org/release/PLICEASE/$_dist-$_ver
 license=('Artistic-1.0-Perl OR GPL-1.0-or-later')
 depends=(
     'perl-module-runtime'
-    'perl-moose>=2.0'
-    'perl-scalar-list-utils>=1.33'
+    'perl-moose'
+    'perl-scalar-list-utils'
     'perl-try-tiny'
     'perl>=5.8.0'
 )
-makedepends=('perl-extutils-makemaker')
+makedepends=(
+    'perl-extutils-makemaker'
+    'perl>=5.6.0'
+)
 checkdepends=(
     'perl-base'
     'perl-moose'
     'perl-test-fatal'
+    'perl-test-simple'
+    'perl>=5.8.0'
 )
 options=('!emptydirs')
-source=("https://cpan.metacpan.org/authors/id/P/PL/PLICEASE/$_dist-$pkgver.tar.gz")
+source=("https://cpan.metacpan.org/authors/id/P/PL/PLICEASE/$_dist-$_ver.tar.gz")
 sha256sums=('6fc7893b47a7db812a3c1fe8bb90d9c235143c6937251e570e27bdbd0d844ece')
 
 build()
 {
-    cd $_dist-$pkgver
+    cd "$_dist-$_ver"
 
     unset PERL_MM_OPT PERL5LIB PERL_LOCAL_LIB_ROOT
     export PERL_MM_USE_DEFAULT=1
@@ -40,7 +46,7 @@ build()
 
 check()
 {
-    cd $_dist-$pkgver
+    cd "$_dist-$_ver"
 
     unset PERL5LIB PERL_LOCAL_LIB_ROOT
 
@@ -49,7 +55,7 @@ check()
 
 package()
 {
-    cd $_dist-$pkgver
+    cd "$_dist-$_ver"
 
     unset PERL5LIB PERL_LOCAL_LIB_ROOT