diff --git a/perl-getopt-argvfile/PKGBUILD b/perl-getopt-argvfile/PKGBUILD
index 482a8aaa..8e387f38 100644
--- a/perl-getopt-argvfile/PKGBUILD
+++ b/perl-getopt-argvfile/PKGBUILD
@@ -3,9 +3,10 @@
 # Note - ported straight from Archlinux
 # Maintainer: J. Peter Mugaas <jpmugaas@suddenlink.net>
 
-pkgname=perl-getopt-argvfile
+_realname=Getopt-ArgvFile
+pkgname=perl-${_realname}
 pkgver=1.11
-pkgrel=8
+pkgrel=1
 pkgdesc="Take options from files"
 arch=('any')
 url="http://search.cpan.org/~JSTENZEL/Getopt-ArgvFile"
@@ -17,18 +18,14 @@ sha256sums=('3709aa513ce6fd71d1a55a02e34d2f090017d5350a9bd447005653c9b0835b22')
 
 build() {
   cd  Getopt-ArgvFile-${pkgver}
-
   PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor 
-
   make
 }
 
 package() {
   cd  Getopt-ArgvFile-${pkgver}
+  make install DESTDIR="${pkgdir}"
 
-  make install DESTDIR="$pkgdir"
-
-  find "$pkgdir" -name '.packlist' -delete
-  find "$pkgdir" -name '*.pod' -delete
+  find "${pkgdir}" -name '.packlist' -delete
+  find "${pkgdir}" -name '*.pod' -delete
 }
-
diff --git a/txt2html/PKGBUILD b/txt2html/PKGBUILD
index ebaa2265..5b006444 100644
--- a/txt2html/PKGBUILD
+++ b/txt2html/PKGBUILD
@@ -8,24 +8,24 @@ pkgdesc="Convert plain text files to HTML"
 arch=('i686' 'x86_64')
 url="http://txt2html.sourceforge.net/"
 license=('GPL' 'PerlArtistic')
-depends=('perl>=5.10.0' 'perl-getopt-argvfile')
+depends=('perl>=5.10.0' 'perl-Getopt-ArgvFile')
 options=(!emptydirs)
-source=(http://www.cpan.org/authors/id/R/RU/RUBYKAT/${pkgname}-$pkgver.tar.gz)
+source=(http://www.cpan.org/authors/id/R/RU/RUBYKAT/${pkgname}-${pkgver}.tar.gz)
 sha256sums=('8162bd4ff5de1022d69435b86ec8dc77f9379bc509388513a535722aec918203')
 
 prepare() {
-  cd "$srcdir/$pkgname-$pkgver"
-  sed -i 's/^use strict;$/&\nour $VERSION;/' scripts/txt2html
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  sed -i 's/^use strict;$/&\nour ${VERSION};/' scripts/txt2html
   sed -i 's/use YAML/#use YAML/g' lib/HTML/TextToHTML.pm
 }
 
 build() {
-  cd "$srcdir/$pkgname-$pkgver"
+  cd "${srcdir}/${pkgname}-${pkgver}"
   /usr/bin/perl Build.PL --installdirs vendor
   ./Build
 }
 
 package() {
-  cd "$srcdir/$pkgname-$pkgver"
-  ./Build install --destdir "$pkgdir" --install_path script=usr/bin
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  ./Build install --destdir "${pkgdir}" --install_path script=usr/bin
 }