diff --git a/.SRCINFO b/.SRCINFO
index eac684cc218a..7c504b896928 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,15 +1,13 @@
-pkgbase = perl-extutils-typemaps-default
-	pkgdesc = ExtUtils::Typemaps::Default - A set of useful typemaps
-	pkgver = 1.05
+pkgbase = perl-extutils-typemap
+	pkgdesc = ExtUtils::Typemap
+	pkgver = 1.00
 	pkgrel = 1
-	url = http://search.cpan.org/dist/ExtUtils-Typemaps-Default//
+	url = http://search.cpan.org/dist/ExtUtils-Typemap/
 	arch = any
-	license = GPL
-	license = PerlArtistic
-	depends = perl>=5.10.0
-	options = !emptydirs
-	source = http://search.cpan.org/CPAN/authors/id/S/SM/SMUELLER/ExtUtils-Typemaps-Default-1.05.tar.gz
-	md5sums = 346c127faf7b74bc4cfc29fa3e8e6f8d
+	license = unknown
+	depends = perl
+	source = http://search.cpan.org/CPAN/authors/id/S/SM/SMUELLER/ExtUtils-Typemap-1.00.tar.gz
+	sha256sums = b1b015772dbb068b93a0f6ffa02f5d94822365e6018ac5ed2bc53ca669071fc7
 
-pkgname = perl-extutils-typemaps-default
+pkgname = perl-extutils-typemap
 
diff --git a/PKGBUILD b/PKGBUILD
index 4d6c6a9778f0..ae8883a28a6a 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,47 +1,36 @@
+# Maintainer: Yardena Cohen <yardenack at gmail dot com>
 # Contributor: Swift Geek <swiftgeek «at» gmail.com>
-pkgname=perl-extutils-typemaps-default
-pkgver=1.05
+cpaname=ExtUtils-Typemap
+pkgname=perl-${cpaname,,}
+pkgver=1.00
 pkgrel=1
-pkgdesc="ExtUtils::Typemaps::Default - A set of useful typemaps"
+pkgdesc="ExtUtils::Typemap "
 arch=('any')
-url="http://search.cpan.org/dist/ExtUtils-Typemaps-Default//"
-license=('GPL' 'PerlArtistic')
-depends=('perl>=5.10.0')
-makedepends=()
-provides=()
-conflicts=()
-replaces=()
-backup=()
-options=(!emptydirs)
-install=
-source=("http://search.cpan.org/CPAN/authors/id/S/SM/SMUELLER/ExtUtils-Typemaps-Default-${pkgver}.tar.gz")
-md5sums=('346c127faf7b74bc4cfc29fa3e8e6f8d')
-
-prepare() {
-  export _src_dir="$srcdir/ExtUtils-Typemaps-Default-$pkgver"
-  # Setting these env variables overwrites any command-line-options we don't want...
-  export PERL_MM_USE_DEFAULT=1 PERL_AUTOINSTALL=--skipdeps \
-    PERL_MM_OPT="INSTALLDIRS=vendor DESTDIR='$pkgdir'" \
-    PERL_MB_OPT="--installdirs vendor --destdir '$pkgdir'" \
-    MODULEBUILDRC=/dev/null
-}
+url="http://search.cpan.org/dist/${cpaname}/"
+license=('unknown')
+depends=('perl')
+source=("http://search.cpan.org/CPAN/authors/id/S/SM/SMUELLER/${cpaname}-${pkgver}.tar.gz")
+sha256sums=('b1b015772dbb068b93a0f6ffa02f5d94822365e6018ac5ed2bc53ca669071fc7')
+export PERL_MM_USE_DEFAULT=1 PERL_AUTOINSTALL=--skipdeps \
+	 PERL_MM_OPT="INSTALLDIRS=vendor DESTDIR='${pkgdir}'" \
+	 PERL_MB_OPT="--installdirs vendor --destdir '${pkgdir}'" \
+	 MODULEBUILDRC=/dev/null
 
 build() {
-  cd "$_src_dir"
-  /usr/bin/perl Build.PL 
-  ./Build 
+	 cd "${srcdir}/${cpaname}-${pkgver}"
+	 perl Build.PL
+	 ./Build
 }
 
-check () {
-  cd "$_src_dir"
-  ./Build test
+check() {
+	 cd "${srcdir}/${cpaname}-${pkgver}"
+	 ./Build test
 }
 
 package () {
-  cd "$_src_dir"
-  ./Build install
+	 cd "${srcdir}/${cpaname}-${pkgver}"
+	 ./Build install
 
-  # remove perllocal.pod and .packlist
-  find "$pkgdir" -name .packlist -o -name perllocal.pod -delete
+	 find "${pkgdir}" -name .packlist -o -name perllocal.pod -delete
 }