diff --git a/srcpkgs/awoken-icons/template b/srcpkgs/awoken-icons/template
index f53496df20..3ced4bde87 100644
--- a/srcpkgs/awoken-icons/template
+++ b/srcpkgs/awoken-icons/template
@@ -1,48 +1,55 @@
 # Template file for 'awoken-icons'
 pkgname=awoken-icons
 version=2.5.2
-revision=1
-noarch="yes"
+revision=2
 distfiles="https://dl.dropbox.com/u/8029324/AwOken-2.5.zip"
 checksum="d122ee0457079aaa30a664ae582fbc6208414e8728f497dce399ed9f33f9b36e"
-makedepends="unzip"
-depends="zenity xdg-utils ImageMagick"
-wrksrc="AwOken-2.5"
-maintainer="Steven R <strob AT styez DOT com>"
+hostmakedepends="unzip"
+maintainer="Steven R <dev@styez.com>"
 homepage="http://alecive.deviantart.com/art/AwOken-163570862"
 license="CCPL:by-sa"
 short_desc="Simple and quite complete icon set, Token-style"
 
+noarch="yes"
+wrksrc="AwOken-2.5"
+build_options="customico"
+desc_option_customico="Enable support for Custom Icons Themes"
+
+if [ "$build_option_customico" ]; then
+    depends="zenity xdg-utils ImageMagick"
+fi
+
 do_install() {
-  vmkdir "usr/bin"
-  vmkdir "usr/share/icons"
-  for _theme in AwOken{,Dark,White}.tar.gz; do
-    tar --no-same-owner -xzf "$_theme" -C "${DESTDIR}/usr/share/icons/"
-  done
-  find "${DESTDIR}" -type d -exec chmod 755 '{}' \;
-  find "${DESTDIR}" -type f -exec chmod 644 '{}' \;
-  find "${DESTDIR}" -name awoken-icon-theme-customization\* -exec chmod 755 '{}' \;
-  ln -sf /usr/share/icons/AwOken/awoken-icon-theme-customization "${DESTDIR}/usr/bin/"
-  ln -sf /usr/share/icons/AwOkenDark/awoken-icon-theme-customization-dark "${DESTDIR}/usr/bin/"
-  ln -sf /usr/share/icons/AwOkenWhite/awoken-icon-theme-customization-white "${DESTDIR}/usr/bin/"
+    vmkdir "usr/share/icons"
+    for _theme in AwOken{,Dark,White}.tar.gz; do
+        tar --no-same-owner -xzf "$_theme" -C "${DESTDIR}/usr/share/icons/"
+    done
+    find "${DESTDIR}" -type d -exec chmod 755 '{}' \;
+    find "${DESTDIR}" -type f -exec chmod 644 '{}' \;
+    if [ "$build_option_customico" ]; then
+        vmkdir "usr/bin"
+        find "${DESTDIR}" -name awoken-icon-theme-customization\* -exec chmod 755 '{}' \;
+        ln -sf /usr/share/icons/AwOken/awoken-icon-theme-customization "${DESTDIR}/usr/bin/"
+        ln -sf /usr/share/icons/AwOken/awoken-icon-theme-customization-clear "${DESTDIR}/usr/bin/"
+        ln -sf /usr/share/icons/AwOkenDark/awoken-icon-theme-customization-dark "${DESTDIR}/usr/bin/"
+        ln -sf /usr/share/icons/AwOkenWhite/awoken-icon-theme-customization-white "${DESTDIR}/usr/bin/"
+    fi
 }
 
 awoken-icons-dark_package() {
-  depends="awoken-icons>=${version}"
-  short_desc+=" - Dark icons"
-  noarch="yes"
-  pkg_install() {
-    vmove usr/share/icons/AwOkenDark
-    vmove usr/bin/awoken-icon-theme-customization-dark
-  }
+    depends="awoken-icons>=${version}"
+    short_desc+=" - Dark icons"
+    noarch="yes"
+    pkg_install() {
+        vmove usr/share/icons/AwOkenDark/
+    }
 }
 
 awoken-icons-white_package() {
-  depends="awoken-icons>=${version}"
-  short_desc+=" - White icons"
-  noarch="yes"
-  pkg_install() {
-    vmove usr/share/icons/AwOkenWhite
-    vmove usr/bin/awoken-icon-theme-customization-white
-  }
+    depends="awoken-icons>=${version}"
+    short_desc+=" - White icons"
+    noarch="yes"
+    pkg_install() {
+        vmove usr/share/icons/AwOkenWhite/
+    }
 }
diff --git a/srcpkgs/beets/template b/srcpkgs/beets/template
index f6675dd5c3..8b8529f2e3 100644
--- a/srcpkgs/beets/template
+++ b/srcpkgs/beets/template
@@ -1,16 +1,18 @@
 # Template file for 'beets'
 pkgname=beets
 version=1.3.2
-revision=1
-noarch="yes"
+revision=2
 distfiles="https://github.com/sampsyo/beets/archive/v${version}.tar.gz"
 checksum="1946b5e981a2858112b7f3aadb2d5f22c1d1438f2753cfda9996091c5e30520a"
-build_style=python-module
-hostmakedepends="python-devel"
-makedepends="python-distribute"
-depends="python>=2.7 pyyaml python-Unidecode python-musicbrainzngs mutagen>=1.22 python-munkres python-distribute"
+build_style="python-module"
 pycompile_module="beets beetsplug"
-maintainer="Steven R <strob AT styez DOT com>"
+hostmakedepends="python-devel python-distribute"
+makedepends="${hostmakedepends}"
+depends="python pyyaml python-Unidecode python-musicbrainzngs mutagen>=1.22 python-munkres python-distribute"
+maintainer="Steven R <dev@styez.com>"
 homepage="https://github.com/sampsyo/beets"
 license="GPL"
 short_desc="Media library management system for obsessive-compulsive music geeks"
+
+noarch="yes"
+create_srcdir="yes"
diff --git a/srcpkgs/chromaprint/template b/srcpkgs/chromaprint/template
index 88acc09879..9323bcb18c 100644
--- a/srcpkgs/chromaprint/template
+++ b/srcpkgs/chromaprint/template
@@ -1,23 +1,24 @@
 # Template file for 'chromaprint'
 pkgname=chromaprint
 version=1.1
-revision=1
-build_style=cmake
-hostmakedepends="cmake"
-makedepends="ffmpeg-devel>=2.1"
-maintainer="Steven R <strob AT styez DOT com>"
-homepage="http://acoustid.org/chromaprint/"
-license="LGPL"
-short_desc="Library that implements a custom algorithm for extracting fingerprints from any audio source"
+revision=2
 distfiles="https://bitbucket.org/acoustid/chromaprint/downloads/chromaprint-${version}.tar.gz"
 checksum="6b14d7ea4964581b73bd3f8038c8857c01e446421c1ae99cbbf64de26b47cd12"
+build_style="cmake"
+hostmakedepends="cmake"
+makedepends="ffmpeg-devel"
+maintainer="Steven R <dev@styez.com>"
+homepage="http://acoustid.org/chromaprint/"
+license="LGPL-2"
+short_desc="Library that implements a custom algorithm for extracting fingerprints from any audio source"
+
 
 chromaprint-devel_package() {
-	short_desc+=" - development files"
-	depends="${sourcepkg}>=${version}_${revision}"
-	pkg_install() {
-		vmove usr/include
-		vmove usr/lib/pkgconfig
-		vmove "usr/lib/*.so"
-	}
+    short_desc+=" - development files"
+    depends="${sourcepkg}>=${version}_${revision}"
+    pkg_install() {
+        vmove usr/include
+        vmove usr/lib/pkgconfig
+        vmove "usr/lib/*.so"
+    }
 }
diff --git a/srcpkgs/compton-git/template b/srcpkgs/compton-git/template
index d96e8dcf2e..7dddbd3a25 100644
--- a/srcpkgs/compton-git/template
+++ b/srcpkgs/compton-git/template
@@ -1,18 +1,19 @@
 # Template file for 'compton-git'
 pkgname=compton-git
-version=20140124
+version=20140222
 revision=1
-only_for_archs="i686 x86_64"
-build_style=gnu-makefile
+build_style="gnu-makefile"
 hostmakedepends="pkg-config asciidoc"
 makedepends="dbus-devel libXcomposite-devel libXdamage-devel libXrandr-devel pcre-devel
  libconfig-devel libdrm-devel MesaLib-devel libXinerama-devel desktop-file-utils"
 depends="desktop-file-utils"
-maintainer="Steven R <strob AT styez DOT com>"
+maintainer="Steven R <dev@styez.com>"
 homepage="https://github.com/chjj/compton"
 license="MIT"
 short_desc="A compositor for X (fork of xcompmgr-dana)"
 
+only_for_archs="i686 x86_64"
+
 do_fetch() {
 	local url="git://github.com/chjj/compton.git"
 	msg_normal "Fetching source from $url ...\n"
diff --git a/srcpkgs/duplicity/template b/srcpkgs/duplicity/template
index 5de27f93f9..de822417ad 100644
--- a/srcpkgs/duplicity/template
+++ b/srcpkgs/duplicity/template
@@ -1,20 +1,15 @@
 # Template file for 'duplicity'
 pkgname=duplicity
 version=0.6.23
-revision=1
+revision=2
 distfiles="http://code.launchpad.net/duplicity/0.6-series/${version}/+download/duplicity-${version}.tar.gz"
 checksum="7a17f1e10395dedcf3204bc53925bb9dcbbf2a7552c9b096ebe727eceb9c0c60"
-build_style=python-module
+build_style="python-module"
+pycompile_module="duplicity"
 hostmakedepends="python-devel"
 makedepends="librsync-devel"
-depends="python>=2.7"
-pycompile_module="duplicity"
-maintainer="Steven R <strob AT styez DOT com>"
+depends="python-lockfile"
+maintainer="Steven R <dev@styez.com>"
 homepage="http://duplicity.nongnu.org/"
-license="GPL"
-short_desc="A utility for encrypted, bandwidth-efficient backups using the rsync algorithm."
-
-pre_configure() {
-	chmod 644 "${BUILDDIR}bin/duplicity.1"
-	chmod 644 "${BUILDDIR}bin/rdiffdir.1"
-}
+license="GPL-2"
+short_desc="A utility for encrypted, bandwidth-efficient backups using the rsync algorithm"
diff --git a/srcpkgs/exiftool/template b/srcpkgs/exiftool/template
index c17cf6fc27..6e5a0f3249 100644
--- a/srcpkgs/exiftool/template
+++ b/srcpkgs/exiftool/template
@@ -1,16 +1,17 @@
-# Template build file for 'exiftool'.
+# Template build file for 'exiftool'
 pkgname=exiftool
-version=9.50
+version=9.53
 revision=1
-noarch="yes"
 distfiles="http://www.sno.phy.queensu.ca/~phil/exiftool/Image-ExifTool-${version}.tar.gz"
-checksum="b04bcf9700ba00974051788475c57190fdd5dbdae6e65432ffb2e32056d0ef4e"
-build_style=perl-module
-makedepends="perl>=5.18"
-hostmakedepends="${makedepends}"
-depends="${makedepends}"
-wrksrc="Image-ExifTool-${version}"
-maintainer="Steven R <strob AT styez DOT com>"
+checksum="35139b885e0f759faed0491ac69eb1b764a1e15fadad3271648bac074a06019c"
+build_style="perl-module"
+hostmakedepends="perl"
+makedepends="${hostmakedepends}"
+depends="perl"
+maintainer="Steven R <dev@styez.com>"
 homepage="http://www.sno.phy.queensu.ca/~phil/exiftool/"
 license="GPL"
 short_desc="Reader and rewriter of EXIF informations that supports raw files"
+
+noarch="yes"
+wrksrc="Image-ExifTool-${version}"
diff --git a/srcpkgs/eyeD3/template b/srcpkgs/eyeD3/template
index e9103e3957..c8d7aa222f 100644
--- a/srcpkgs/eyeD3/template
+++ b/srcpkgs/eyeD3/template
@@ -1,16 +1,17 @@
 # Template file for 'eyeD3'
 pkgname=eyeD3
 version=0.7.4
-revision=1
-noarch="yes"
+revision=2
 distfiles="http://eyed3.nicfit.net/releases/eyeD3-${version}.tgz"
 checksum="a138e6e1fd5b8c2b7947a2d22868167ede16bb96e8e02a067951388bf1fb3000"
-build_style=python-module
-hostmakedepends="python-devel python-distribute"
-makedepends="python-devel"
-depends="python>=2.7"
+build_style="python-module"
 pycompile_module="eyeD3"
-maintainer="Steven R <strob AT styez DOT com>"
+hostmakedepends="python-devel python-distribute"
+makedepends="${hostmakedepends}"
+depends="python"
+maintainer="Steven R <dev@styez.com>"
 homepage="http://eyed3.nicfit.net/"
 license="GPL"
-short_desc="Python tool for working with audio files, specifically mp3 files containing ID3 metadata (i.e. song info)."
+short_desc="Python tool for working with audio files, specifically mp3 files containing ID3 metadata"
+
+noarch="yes"
diff --git a/srcpkgs/fdupes/template b/srcpkgs/fdupes/template
index 98a79c1624..59dc748348 100644
--- a/srcpkgs/fdupes/template
+++ b/srcpkgs/fdupes/template
@@ -1,10 +1,10 @@
 # Template file for 'fdupes'
 pkgname=fdupes
 version=1.51
-revision=2
+revision=3
 distfiles="https://fdupes.googlecode.com/files/fdupes-${version}.tar.gz"
 checksum="87dbc85b7b9cdb9626e713dd8078bd7487bceb58d47ceaff5404a9e6fd062881"
-maintainer="Steven R <strob AT styez DOT com>"
+maintainer="Steven R <dev@styez.com>"
 homepage="https://code.google.com/p/fdupes/"
 license="MIT"
 short_desc="Identifying or deleting duplicate files residing within specified directories"
diff --git a/srcpkgs/glances/template b/srcpkgs/glances/template
index 869edd7d39..1a6b4b3a57 100644
--- a/srcpkgs/glances/template
+++ b/srcpkgs/glances/template
@@ -1,17 +1,18 @@
 # Template file for 'glances'
 pkgname=glances
 version=1.7.4
-revision=1
-noarch="yes"
-create_srcdir="yes"
+revision=2
 distfiles="https://github.com/nicolargo/glances/archive/v${version}.tar.gz"
 checksum="20960b5f191bc86e6184d937940f00a62100eb51388bcdeb233f30c809b0f1a6"
 build_style="python-module"
-hostmakedepends="python-devel"
-makedepends="python-distribute"
-depends="python python-psutil ${makedepends}"
 pycompile_module="glances"
-maintainer="Steven R <strob AT styez DOT com>"
+hostmakedepends="python-devel python-distribute"
+makedepends="${hostmakedepends}"
+depends="python python-psutil python-distribute"
+maintainer="Steven R <dev@styez.com>"
 homepage="https://github.com/nicolargo/glances"
-license="LGPL3"
+license="LGPL-3"
 short_desc="Cross-platform curses-based monitoring tool written in Python"
+
+noarch="yes"
+create_srcdir="yes"
diff --git a/srcpkgs/gtk-engine-murrine/template b/srcpkgs/gtk-engine-murrine/template
index 64d51757c5..a7634693c8 100644
--- a/srcpkgs/gtk-engine-murrine/template
+++ b/srcpkgs/gtk-engine-murrine/template
@@ -1,14 +1,15 @@
 # Template file for 'gtk-engine-murrine'
 pkgname=gtk-engine-murrine
 version=0.98.2
-revision=2
-distfiles="http://ftp.gnome.org/pub/GNOME/sources/murrine/0.98/murrine-${version}.tar.xz"
+revision=3
+distfiles="${GNOME_SITE}/murrine/0.98/murrine-${version}.tar.xz"
 checksum="e9c68ae001b9130d0f9d1b311e8121a94e5c134b82553ba03971088e57d12c89"
-build_style=gnu-configure
-hostmakedepends="intltool pkg-config"
+build_style="gnu-configure"
+hostmakedepends="pkg-config intltool"
 makedepends="gtk+-devel"
-wrksrc="murrine-0.98.2"
-maintainer="Steven R <strob AT styez DOT com>"
+maintainer="Steven R <dev@styez.com>"
 homepage="http://cimitan.com/murrine/project/murrine"
-license="LGPL3"
+license="LGPL-3"
 short_desc="GTK2 engine to make your desktop look like a murrina"
+
+wrksrc="murrine-${version}"
diff --git a/srcpkgs/gtk-sharp/template b/srcpkgs/gtk-sharp/template
index 405e9c80e1..f5fb2da924 100644
--- a/srcpkgs/gtk-sharp/template
+++ b/srcpkgs/gtk-sharp/template
@@ -1,19 +1,20 @@
 # Template file for 'gtk-sharp'
 pkgname=gtk-sharp
 version=2.99.2
-revision=1
-create_srcdir=yes
+revision=2
 distfiles="https://github.com/mono/gtk-sharp/archive/${version}.tar.gz"
 checksum="a2f143cfa9a33f7249770b13086e9cfb9c122d8a8b91a231f9343dd91bdb3a0b"
-build_style=gnu-configure
-hostmakedepends="pkg-config autoconf automake"
-makedepends="mono gtk+3-devel libglade-devel libtool which"
-depends="mono gtk+"
-maintainer="Steven R <strob AT styez DOT com>"
+build_style="gnu-configure"
+hostmakedepends="pkg-config autoconf automake which libtool"
+makedepends="mono gtk+3-devel libglade-devel"
+maintainer="Steven R <dev@styez.com>"
 homepage="http://www.mono-project.com/GtkSharp"
 license="LGPL"
 short_desc="Graphical User Interface Toolkit for mono and .Net (Gtk#)"
 
+create_srcdir=yes
+only_for_archs="i686 x86_64"
+
 pre_configure() {
 	./autogen.sh
 }
diff --git a/srcpkgs/librsync/template b/srcpkgs/librsync/template
index b4750c8f39..474243ed32 100644
--- a/srcpkgs/librsync/template
+++ b/srcpkgs/librsync/template
@@ -1,22 +1,22 @@
 # Template file for 'librsync'
 pkgname=librsync
 version=0.9.7
-revision=1
+revision=2
 distfiles="${SOURCEFORGE_SITE}/librsync/${version}/librsync-${version}.tar.gz"
 checksum="6633e4605662763a03bb6388529cbdfd3b11a9ec55b8845351c1bd9a92bc41d6"
-build_style=gnu-configure
+build_style="gnu-configure"
 configure_args=" --enable-shared"
 makedepends="popt-devel"
-maintainer="Steven R <strob AT styez DOT com>"
+maintainer="Steven R <dev@styez.com>"
 homepage="http://librsync.sourceforge.net/"
 license="GPL"
 short_desc="A free software library that implements the rsync remote-delta algorithm (rdiff)"
 
 librsync-devel_package() {
-	short_desc+=" - Development files"
-	depends="librsync-${version}_${revision}"
-	pkg_install() {
-		vmove usr/include
-		vmove "usr/lib/*.a"
-	}
+    short_desc+=" - Development files"
+    depends="librsync-${version}_${revision}"
+    pkg_install() {
+        vmove usr/include
+        vmove "usr/lib/*.a"
+    }
 }
diff --git a/srcpkgs/lrzip/template b/srcpkgs/lrzip/template
index 04cd4772db..d740fc69e7 100644
--- a/srcpkgs/lrzip/template
+++ b/srcpkgs/lrzip/template
@@ -1,31 +1,37 @@
-# Template file for 'mtr'
+# Template file for 'lrzip'
 pkgname=lrzip
 version=0.616
-revision=1
-distfiles="http://ck.kolivas.org/apps/lrzip/lrzip-${version}.tar.bz2"
-checksum="982d5a8db4d8bbbced6e33fbbcd589c9b3fc4275110155d7bd71cbeff4a235ae"
-build_style=gnu-configure
-hostmakedepends="perl"
+revision=2
+distfiles="https://github.com/ckolivas/lrzip/archive/v${version}.tar.gz"
+checksum="6ef50bfec15d7585e5b085067c9fe91a87246ccd14a3165acd08b147bba26a2e"
+build_style="gnu-configure"
+hostmakedepends="perl automake libtool"
 makedepends="zlib-devel bzip2-devel lzo-devel"
-maintainer="Steven R <strob AT styez DOT com>"
+maintainer="Steven R <dev@styez.com>"
 homepage="http://lrzip.kolivas.org/"
 license="GPL"
 short_desc="Multi-threaded compression using the rzip/lzma, lzo, and zpaq algorithms"
 
+create_srcdir="yes"
+
+pre_configure() {
+    ./autogen.sh
+}
+
 lrzip-devel_package() {
-	short_desc+=" - development files"
-	depends="liblrzip-${version}_${revision}"
-	pkg_install() {
-		vmove usr/include
-		vmove usr/lib/pkgconfig
-		vmove "usr/lib/*.a"
-		vmove "usr/lib/*.so"
-	}
+    short_desc+=" - development files"
+    depends="liblrzip-${version}_${revision}"
+    pkg_install() {
+        vmove usr/include
+        vmove usr/lib/pkgconfig
+        vmove "usr/lib/*.a"
+        vmove "usr/lib/*.so"
+    }
 }
 
 liblrzip_package() {
-	short_desc+=" - runtime library"
-	pkg_install() {
-		vmove "usr/lib/*.so.*"
-	}
+    short_desc+=" - runtime library"
+    pkg_install() {
+        vmove "usr/lib/*.so.*"
+    }
 }
diff --git a/srcpkgs/meld/template b/srcpkgs/meld/template
index e18ad187aa..a8ed124fa6 100644
--- a/srcpkgs/meld/template
+++ b/srcpkgs/meld/template
@@ -1,18 +1,18 @@
 # Template file for 'meld'
 pkgname=meld
-version=1.8.0
-revision=2
+version=1.8.4
+revision=1
 noarch=yes
 build_style=gnu-makefile
 make_build_args="prefix=/usr"
 make_install_args="prefix=/usr"
 hostmakedepends="pkg-config intltool gnome-doc-utils python"
 makedepends="pygtk-devel pygtksourceview desktop-file-utils hicolor-icon-theme"
-depends="${makedepends}"
+depends="pygtk pygtksourceview desktop-file-utils hicolor-icon-theme"
 pycompile_dirs="usr/lib/meld/meld/"
 short_desc="Visual diff and merge tool"
 maintainer="Juan RP <xtraeme@gmail.com>"
 homepage="http://meldmerge.org/"
 license="GPL-2"
 distfiles="${GNOME_SITE}/meld/1.8/meld-${version}.tar.xz"
-checksum=749668f9cbd2f8d11d87b46fda0c1a2190d24668a633d0435ed03d58fc36c65b
+checksum=b46e5786343f236d203037a7ace8f1b28145a51a3f84fa527efcf62f47b5b8de
diff --git a/srcpkgs/mtr/template b/srcpkgs/mtr/template
index dce4647de7..ea3163a7a0 100644
--- a/srcpkgs/mtr/template
+++ b/srcpkgs/mtr/template
@@ -4,16 +4,16 @@ version=0.85
 revision=1
 distfiles="https://github.com/traviscross/mtr/archive/v${version}.tar.gz"
 checksum="4c3c02cc8290798a067d514c9b243fdc90a75e58ca1a35da8e93a163f11c1884"
-build_style=gnu-configure
+build_style="gnu-configure"
 hostmakedepends="automake pkg-config"
 makedepends="ncurses-devel gtk+-devel"
-maintainer="Steven R <strob AT styez DOT com>"
+maintainer="Steven R <dev@styez.com>"
 homepage="http://www.bitwizard.nl/mtr/"
 license="GPL"
 short_desc="Combines the functionality of traceroute and ping into one tool (CLI version)"
 
-create_srcdir=yes
+create_srcdir="yes"
 
 pre_configure() {
-	./bootstrap.sh
+    ./bootstrap.sh
 }
diff --git a/srcpkgs/powerdown-git/template b/srcpkgs/powerdown-git/template
index e2333bc45e..0c3bcb7e0b 100644
--- a/srcpkgs/powerdown-git/template
+++ b/srcpkgs/powerdown-git/template
@@ -1,14 +1,16 @@
 # Template file for 'powerdown-git'
 pkgname=powerdown-git
-version=20140210
+version=20140222
 revision=1
-build_style=gnu-makefile
+build_style="gnu-makefile"
 depends="bc hdparm x86_energy_perf_policy"
-maintainer="Steven R <strob AT styez DOT com>"
+maintainer="Steven R <dev@styez.com>"
 homepage="http://github.com/taylorchu/powerdown"
 license="GPL-2"
 short_desc="A simple linux powersaving script"
 
+noarch="yes"
+
 do_fetch() {
     local url="git://github.com/taylorchu/powerdown.git"
     msg_normal "Fetching source from $url ...\n"
diff --git a/srcpkgs/python-audioread/template b/srcpkgs/python-audioread/template
index d22bc1a4d3..da18c90789 100644
--- a/srcpkgs/python-audioread/template
+++ b/srcpkgs/python-audioread/template
@@ -1,17 +1,19 @@
 # Template file for 'python-audioread'
 pkgname=python-audioread
 version=1.0.1
-revision=1
-noarch="yes"
+revision=2
 distfiles="https://github.com/sampsyo/audioread/archive/v${version}.tar.gz"
 checksum="0e6d0f13bdb8e462a84722050f02538eade9e5c6d8da94aa7cdfa2552af15df6"
-build_style=python-module
-hostmakedepends="python-devel python-distribute"
-makedepends="python-devel"
-depends="python>=2.7 gst-python"
+build_style="python-module"
 pycompile_module="audioread"
-wrksrc="audioread-${version}"
-maintainer="Steven R <strob AT styez DOT com>"
+hostmakedepends="python-devel python-distribute"
+makedepends="${hostmakedepends}"
+depends="python gst-python"
+maintainer="Steven R <dev@styez.com>"
 homepage="https://github.com/sampsyo/audioread"
 license="MIT"
 short_desc="Cross-library (GStreamer + Core Audio + MAD + FFmpeg) audio decoding for Python"
+
+noarch="yes"
+create_srcdir="yes"
+wrksrc="audioread-${version}"
diff --git a/srcpkgs/python-munkres/template b/srcpkgs/python-munkres/template
index 6a77fd819e..b45dfd4dc4 100644
--- a/srcpkgs/python-munkres/template
+++ b/srcpkgs/python-munkres/template
@@ -1,17 +1,18 @@
 # Template file for 'python-munkres'
 pkgname=python-munkres
 version=1.0.6
-revision=1
+revision=2
 distfiles="https://pypi.python.org/packages/source/m/munkres/munkres-${version}.tar.gz"
 checksum="c78f803b9b776bfb20a25c9c7bb44adbf0f9202c2024d51aa5969d21e560208d"
-build_style=python-module
-hostmakedepends="python-devel"
-makedepends="python-distribute"
-noarch="yes"
-depends="python>=2.7"
+build_style="python-module"
 pycompile_module="munkres"
-wrksrc="munkres-${version}"
-maintainer="Steven R <strob AT styez DOT com>"
+hostmakedepends="python-devel python-distribute"
+makedepends="${hostmakedepends}"
+depends="python"
+maintainer="Steven R <dev@styez.com>"
 homepage="http://bmc.github.com/munkres/"
 license="BSD"
 short_desc="Algorithm for the Assignment Problem"
+
+noarch="yes"
+wrksrc="munkres-${version}"
diff --git a/srcpkgs/python-musicbrainzngs/template b/srcpkgs/python-musicbrainzngs/template
index 26c981ff37..83ec7cebca 100644
--- a/srcpkgs/python-musicbrainzngs/template
+++ b/srcpkgs/python-musicbrainzngs/template
@@ -1,17 +1,18 @@
 # Template file for 'python-musicbrainzngs'
 pkgname=python-musicbrainzngs
 version=0.5
-revision=1
+revision=2
 distfiles="https://pypi.python.org/packages/source/m/musicbrainzngs/musicbrainzngs-${version}.tar.gz"
 checksum="281388ab750d2996e9feca4580fd4215d616a698e02cd6719cb9b8562945c489"
-build_style=python-module
-hostmakedepends="python-devel"
-makedepends="python-distribute"
-noarch="yes"
-depends="python>=2.7"
+build_style="python-module"
 pycompile_module="musicbrainzngs"
-wrksrc="musicbrainzngs-${version}"
-maintainer="Steven R <strob AT styez DOT com>"
+hostmakedepends="python-devel python-distribute"
+makedepends="${hostmakedepends}"
+depends="python"
+maintainer="Steven R <dev@styez.com>"
 homepage="https://github.com/alastair/python-musicbrainz-ngs"
 license="BSD"
 short_desc="Python bindings for the Musicbrainz NGS webservice interface"
+
+noarch="yes"
+wrksrc="musicbrainzngs-${version}"
diff --git a/srcpkgs/python-psutil/template b/srcpkgs/python-psutil/template
index 772d7ba2e8..fa148f5e99 100644
--- a/srcpkgs/python-psutil/template
+++ b/srcpkgs/python-psutil/template
@@ -1,16 +1,16 @@
 # Template file for 'python-psutil'
 pkgname=python-psutil
 version=1.2.1
-revision=1
+revision=2
 distfiles="https://pypi.python.org/packages/source/p/psutil/psutil-${version}.tar.gz"
 checksum="508e4a44c8253a386a0f86d9c9bd4a1b4cbb2f94e88d49a19c1513653ca66c45"
-build_style=python-module
-hostmakedepends="python-devel python-distribute"
-makedepends="python-devel"
-depends="python>=2.7"
+build_style="python-module"
 pycompile_module="psutil"
-wrksrc="psutil-${version}"
-maintainer="Steven R <strob AT styez DOT com>"
+hostmakedepends="python-devel python-distribute"
+makedepends="${hostmakedepends}"
+maintainer="Steven R <dev@styez.com>"
 homepage="http://code.google.com/p/psutil/"
 license="BSD"
 short_desc="A cross-platform process and system utilities module for Python"
+
+wrksrc="psutil-${version}"
diff --git a/srcpkgs/python-pyacoustid/template b/srcpkgs/python-pyacoustid/template
index de19d9ec86..3ce18c1852 100644
--- a/srcpkgs/python-pyacoustid/template
+++ b/srcpkgs/python-pyacoustid/template
@@ -1,17 +1,18 @@
 # Template file for 'python-pyacoustid'
 pkgname=python-pyacoustid
 version=1.0.0
-revision=1
+revision=2
 distfiles="https://pypi.python.org/packages/source/p/pyacoustid/pyacoustid-${version}.tar.gz"
 checksum="31900428e7b344dca0c2da594b387e88620c319298e3a6400a968078194407d4"
-build_style=python-module
-hostmakedepends="python-distribute"
-makedepends="python-devel"
-noarch="yes"
+build_style="python-module"
 pycompile_module="pyacoustid"
-depends="python>=2.7"
-maintainer="Steven R <strob AT styez DOT com>"
+hostmakedepends="python-devel python-distribute"
+makedepends="${hostmakedepends}"
+depends="python"
+maintainer="Steven R <dev@styez.com>"
 homepage="https://github.com/sampsyo/pyacoustid"
 license="MIT"
 short_desc="Bindings for Chromaprint acoustic fingerprinting and the Acoustid API"
+
+noarch="yes"
 wrksrc="pyacoustid-${version}"
diff --git a/srcpkgs/python-pylastfp/template b/srcpkgs/python-pylastfp/template
index 9ae505ac13..3794ff941a 100644
--- a/srcpkgs/python-pylastfp/template
+++ b/srcpkgs/python-pylastfp/template
@@ -1,16 +1,17 @@
 # Template file for 'python-pylastfp'
 pkgname=python-pylastfp
 version=0.6
-revision=1
+revision=2
 distfiles="https://pypi.python.org/packages/source/p/pylastfp/pylastfp-${version}.tar.gz"
 checksum="5f9a32e532ab62e5663298b4b3b1db86f5466404f111ccaa9030c23ffee140f7"
-build_style=python-module
-hostmakedepends="python-devel python-distribute"
-makedepends="python-devel libsamplerate-devel fftw-devel"
-depends="python>=2.7 gst-python"
+build_style="python-module"
 pycompile_module="pylastfp"
-wrksrc="pylastfp-${version}"
-maintainer="Steven R <strob AT styez DOT com>"
+hostmakedepends="python-devel python-distribute"
+makedepends="libsamplerate-devel fftw-devel"
+depends="gst-python"
+maintainer="Steven R <dev@styez.com>"
 homepage="https://github.com/sampsyo/pylastfp"
 license="GPL"
 short_desc="Python interface to Last.fm's acoustic fingerprinting library (called fplib) and its related API services"
+
+wrksrc="pylastfp-${version}"
diff --git a/srcpkgs/python-requests/template b/srcpkgs/python-requests/template
index 28abf8dc5f..c49b366e07 100644
--- a/srcpkgs/python-requests/template
+++ b/srcpkgs/python-requests/template
@@ -1,17 +1,18 @@
 # Template file for 'python-requests'
 pkgname=python-requests
 version=2.2.1
-revision=1
+revision=2
 distfiles="https://pypi.python.org/packages/source/r/requests/requests-${version}.tar.gz"
 checksum="1266921f1bed5fbf364cd83cf239b6d7b3ea5c32ccccbc93980d9ba12cdcfd02"
-build_style=python-module
-hostmakedepends="python-distribute"
-makedepends="python-devel"
-noarch="yes"
+build_style="python-module"
 pycompile_module="requests"
-depends="python>=2.7"
-wrksrc="requests-${version}"
-maintainer="Steven R <strob AT styez DOT com>"
+hostmakedepends="python-devel python-distribute"
+makedepends="${hostmakedepends}"
+depends="python"
+maintainer="Steven R <dev@styez.com>"
 homepage="http://docs.python-requests.org/en/latest/"
 license="Apache-2.0"
-short_desc="Python HTTP for Humans."
+short_desc="Python HTTP for Humans"
+
+noarch="yes"
+wrksrc="requests-${version}"
diff --git a/srcpkgs/shorewall/template b/srcpkgs/shorewall/template
index 5cf259c405..316ec045f2 100644
--- a/srcpkgs/shorewall/template
+++ b/srcpkgs/shorewall/template
@@ -1,7 +1,7 @@
 # Template file for 'shorewall'
 pkgname=shorewall
 version=4.5.21.6
-revision=1
+revision=2
 _disturl="http://www.shorewall.net/pub/${pkgname}/4.5/${pkgname}-4.5.21"
 distfiles="
  ${_disturl}/${pkgname}-${version}.tar.bz2
@@ -11,13 +11,16 @@ checksum="
  b09fa932174e0aa0b3f8264999f33815b20498086e93129ea6cd956d3e8760ed
  de88cab288c5f28b287454bcbda3ab4012aed77fe0b0ebb9e0d16261c1ca3246
  0fe852f02b7a2b9d98f2a84c19f7a4d1b7650b126cc55f4fdb565a08908413e6"
-maintainer="Steven R <strob AT styez DOT com>"
+depends="shorewall-core perl"
+maintainer="Steven R <dev@styez.com>"
 homepage="http://www.shorewall.net/"
 license="GPL"
 short_desc="An iptables-based firewall for Linux systems"
 
-create_wrksrc=yes
 noarch="yes"
+create_wrksrc="yes"
+systemd_services="${pkgname}.service off"
+make_dirs="/var/lib/${pkgname} 0755 0 0"
 conf_files="
  /etc/shorewall/accounting
  /etc/shorewall/actions
@@ -64,45 +67,42 @@ conf_files="
  /etc/shorewall/tunnels
  /etc/shorewall/zones"
 
-depends="shorewall-core perl"
-systemd_services="${pkgname}.service off"
-make_dirs="/var/lib/${pkgname} 0755 0 0"
 
 do_build(){
-	for product in ${pkgname}{-core,6,}-${version}; do
-		cd ${wrksrc}/${product}
-		./configure HOST=archlinux SBINDIR=/usr/bin
-	done
+    for product in ${pkgname}{-core,6,}-${version}; do
+        cd ${wrksrc}/${product}
+        ./configure HOST=archlinux SBINDIR=/usr/bin
+    done
 }
 
 do_install() {
-	cd ${wrksrc}/${pkgname}-${version}
-	DESTDIR="${DESTDIR}" ./install.sh
-	vmkdir usr/share/doc/${pkgname}
-	cp -r Samples ${PKGDESTDIR}/usr/share/doc/${pkgname}
+    cd ${wrksrc}/${pkgname}-${version}
+    DESTDIR="${DESTDIR}" ./install.sh
+    vmkdir usr/share/doc/${pkgname}
+    cp -r Samples ${PKGDESTDIR}/usr/share/doc/${pkgname}
 }
 
 shorewall-core_package() {
-	noarch="yes"
-	depends="iptables iproute2"
-	short_desc+=" - Core Shorewall libraries"
-	pkg_install() {
-		cd ${wrksrc}/${pkgname}-${version}
-		DESTDIR="${PKGDESTDIR}" ./install.sh
-	}
+    noarch="yes"
+    depends="iptables iproute2"
+    short_desc+=" - Core Shorewall libraries"
+    pkg_install() {
+        cd ${wrksrc}/${pkgname}-${version}
+        DESTDIR="${PKGDESTDIR}" ./install.sh
+    }
 }
 
 shorewall6_package() {
-	noarch="yes"
-	depends="shorewall"
-	short_desc+=" - IPv6 support"
-	systemd_services="${pkgname}.service off"
-	make_dirs="/var/lib/${pkgname} 0755 0 0"
-	pkg_install() {
-		cd ${wrksrc}/${pkgname}-${version}
-		DESTDIR="${PKGDESTDIR}" ./install.sh
-	}
-	for f in ${PKGDESTDIR}/etc/${pkgname}/*; do
-		conf_files+="${f##${PKGDESTDIR}} "
-	done
+    noarch="yes"
+    depends="shorewall"
+    short_desc+=" - IPv6 support"
+    systemd_services="${pkgname}.service off"
+    make_dirs="/var/lib/${pkgname} 0755 0 0"
+    pkg_install() {
+        cd ${wrksrc}/${pkgname}-${version}
+        DESTDIR="${PKGDESTDIR}" ./install.sh
+    }
+    for f in ${PKGDESTDIR}/etc/${pkgname}/*; do
+        conf_files+="${f##${PKGDESTDIR}} "
+    done
 }
diff --git a/srcpkgs/sublime-text3/template b/srcpkgs/sublime-text3/template
index d8ebaa5ba2..da177f79c4 100644
--- a/srcpkgs/sublime-text3/template
+++ b/srcpkgs/sublime-text3/template
@@ -1,27 +1,32 @@
 # Template file for 'sublime-text3'
 pkgname=sublime-text3
 version=3061
-revision=1
-distfiles="http://c758482.r82.cf2.rackcdn.com/sublime_text_3_build_${version}_x64.tar.bz2"
-checksum="498a398f14d09e1c319fc2bb1e14d33573ca118d70c351e546912aaf1e22a419"
-maintainer="Steven R <strob AT styez DOT com>"
+revision=2
+if [ "$XBPS_TARGET_MACHINE" = "x86_64" ]; then
+    distfiles="http://c758482.r82.cf2.rackcdn.com/sublime_text_3_build_${version}_x64.tar.bz2"
+    checksum="498a398f14d09e1c319fc2bb1e14d33573ca118d70c351e546912aaf1e22a419"
+else
+    distfiles="http://c758482.r82.cf2.rackcdn.com/sublime_text_3_build_${version}_x32.tar.bz2"
+    checksum="cf6d9a590cdd24a7b5012f8604bd5f776b800042feaaf17cfa587798bdd7b3f9"
+fi
+depends="libpng gtk+ hicolor-icon-theme desktop-file-utils"
+maintainer="Steven R <dev@styez.com>"
 homepage="http://www.sublimetext.com/3dev"
 license="Propietary"
 short_desc="Sophisticated text editor for code, markup and prose"
 
-wrksrc="sublime_text_3"
-only_for_archs="x86_64"
 nonfree="yes"
-depends="libpng gtk+ hicolor-icon-theme desktop-file-utils"
+only_for_archs="i686 x86_64"
+wrksrc="sublime_text_3"
 
 do_install() {
-	vmkdir "usr/bin"
-	vmkdir "usr/share/sublime_text"
-	cp --preserve=mode -r ./* "${DESTDIR}/usr/share/sublime_text"
-	vinstall "sublime_text.desktop" 644 "usr/share/applications/"
-	for size in 128 16 256 32 48; do
-		vinstall "Icon/${size}x${size}/sublime-text.png" 644 "usr/share/icons/hicolor/${size}x${size}/apps/"
-	done
-	ln -s /usr/share/sublime_text/sublime_text ${DESTDIR}/usr/bin/subl3
-	sed -i 's:Exec=/opt/sublime_text/:Exec=/usr/share/sublime_text/:' ${DESTDIR}/usr/share/applications/sublime_text.desktop
+    vmkdir "usr/bin"
+    vmkdir "usr/share/sublime_text"
+    cp --preserve=mode -r ./* "${DESTDIR}/usr/share/sublime_text"
+    vinstall "sublime_text.desktop" 644 "usr/share/applications/"
+    for size in 128 16 256 32 48; do
+        vinstall "Icon/${size}x${size}/sublime-text.png" 644 "usr/share/icons/hicolor/${size}x${size}/apps/"
+    done
+    ln -s /usr/share/sublime_text/sublime_text ${DESTDIR}/usr/bin/subl3
+    sed -i 's:Exec=/opt/sublime_text/:Exec=/usr/share/sublime_text/:' ${DESTDIR}/usr/share/applications/sublime_text.desktop
 }
diff --git a/srcpkgs/taglib-sharp/template b/srcpkgs/taglib-sharp/template
index 7c141e2343..7332ec39c0 100644
--- a/srcpkgs/taglib-sharp/template
+++ b/srcpkgs/taglib-sharp/template
@@ -1,18 +1,20 @@
 # Template file for 'taglib-sharp'
 pkgname=taglib-sharp
 version=2.1.0.0
-revision=1
+revision=2
 distfiles="https://github.com/mono/taglib-sharp/archive/taglib-sharp-${version}.tar.gz"
 checksum="8221fccfc2e834eebb24404f2c0ca26b2788af646a172266f89627a5d339bdec"
-build_style=gnu-configure
-hostmakedepends="automake pkg-config"
+build_style="gnu-configure"
 configure_ags=" --disable-docs"
+hostmakedepends="pkg-config automake"
 makedepends="mono"
-only_for_archs="i686 x86_64"
-maintainer="Steven R <strob AT styez DOT com>"
+maintainer="Steven R <dev@styez.com>"
 homepage="https://github.com/mono/taglib-sharp"
-license="LGPL2"
+license="LGPL-2"
 short_desc="LIbrary for reading and writing metadata in media files"
+
+create_srcdir="yes"
+only_for_archs="i686 x86_64"
 wrksrc="taglib-sharp-taglib-sharp-${version}"
 
 pre_configure() {
diff --git a/srcpkgs/vicious/template b/srcpkgs/vicious/template
index 9d3dd6f378..3e69b75a62 100644
--- a/srcpkgs/vicious/template
+++ b/srcpkgs/vicious/template
@@ -1,25 +1,27 @@
 # Template file for 'vicious'
 pkgname=vicious
 version=2.1.3
-revision=1
-makedepends="lua-devel>=5.2"
-noarch="yes"
-depends="lua>=5.2"
+revision=2
 distfiles="http://git.sysphere.org/vicious/snapshot/vicious-${version}.tar.xz"
 checksum="97ffb824af89f2d205b0f0909601a32d761c0c02353b59b4314fd2cc47b2a387"
-maintainer="Steven R <strob AT styez DOT com>"
+hostmakedepends="lua-devel"
+makedepends="${hostmakedepends}"
+depends="lua"
+maintainer="Steven R <dev@styez.com>"
 homepage="http://git.sysphere.org/vicious/about/"
 license="GPL-2"
 short_desc="Modular widget library for window managers"
 
+noarch="yes"
+
 do_install() {
-	vinstall LICENSE 644 "usr/share/licenses/${pkgname}/"
-	vinstall CHANGES 644 "usr/share/doc/${pkgname}/"
-	vmkdir "usr/share/lua/5.2/${pkgname}/widgets"
-	vmkdir "usr/share/lua/5.2/${pkgname}/contrib"
-	vinstall TODO 644 "usr/share/doc/${pkgname}"
-	vinstall README 644 "usr/share/doc/${pkgname}"
-	install -m644 *.lua "${DESTDIR}/usr/share/lua/5.2/${pkgname}"
-	install -m644 widgets/*.lua "${DESTDIR}/usr/share/lua/5.2/${pkgname}/widgets"
-	install -m644 contrib/*.lua "${DESTDIR}/usr/share/lua/5.2/${pkgname}/contrib"
+    vinstall LICENSE 644 "usr/share/licenses/${pkgname}/"
+    vinstall CHANGES 644 "usr/share/doc/${pkgname}/"
+    vmkdir "usr/share/lua/5.2/${pkgname}/widgets"
+    vmkdir "usr/share/lua/5.2/${pkgname}/contrib"
+    vinstall TODO 644 "usr/share/doc/${pkgname}"
+    vinstall README 644 "usr/share/doc/${pkgname}"
+    install -m644 *.lua "${DESTDIR}/usr/share/lua/5.2/${pkgname}"
+    install -m644 widgets/*.lua "${DESTDIR}/usr/share/lua/5.2/${pkgname}/widgets"
+    install -m644 contrib/*.lua "${DESTDIR}/usr/share/lua/5.2/${pkgname}/contrib"
 }
diff --git a/srcpkgs/wavemon/template b/srcpkgs/wavemon/template
index 9781c0f84f..11d8c28d89 100644
--- a/srcpkgs/wavemon/template
+++ b/srcpkgs/wavemon/template
@@ -1,15 +1,15 @@
 # Template file for 'wavemon'
 pkgname=wavemon
 version=0.7.6
-revision=2
-create_srcdir="yes"
+revision=3
 distfiles="https://github.com/uoaerg/${pkgname}/archive/v${version}.tar.gz"
 checksum="29c62524432213a6ba8c56ac9a35d83876cbc52745c82c2e2fec78e008d46b0e"
-build_style=gnu-configure
+build_style="gnu-configure"
 makedepends="ncurses-devel"
-maintainer="Steven R <strob AT styez DOT com>"
+maintainer="Steven R <dev@styez.com>"
 homepage="http://www.erg.abdn.ac.uk/ergcms/wavemon/"
 license="GPL-3"
 short_desc="Ncurses-based monitoring application for wireless network devices"
 
 CFLAGS="-pthread"
+create_srcdir="yes"
diff --git a/srcpkgs/xcalib/template b/srcpkgs/xcalib/template
index 994f04d6ad..34383a7511 100644
--- a/srcpkgs/xcalib/template
+++ b/srcpkgs/xcalib/template
@@ -1,19 +1,19 @@
 # Template file for 'xcalib'
 pkgname=xcalib
 version=0.8
-revision=1
-build_style=gnu-makefile
+revision=2
 distfiles="${SOURCEFORGE_SITE}/xcalib/xcalib-source-${version}.tar.gz"
 checksum="8a112ee710e5446f6c36e62345b2066f10639d500259db8c48bf1716caea06e6"
+build_style="gnu-makefile"
 makedepends="libX11-devel libXxf86vm-devel"
-maintainer="Steven R <strob AT styez DOT com>"
+maintainer="Steven R <dev@styez.com>"
 homepage="http://www.etg.e-technik.uni-erlangen.de/web/doe/xcalib/"
 license="GPL"
 short_desc="A tiny monitor calibration loader for X.org"
 
 do_install() {
-	vinstall xcalib 755 usr/bin
-	for file in README *.icc *.icm; do
-		vinstall "$file" 644 usr/share/xcalib
-	done
+    vinstall xcalib 755 usr/bin
+    for file in README *.icc *.icm; do
+        vinstall "$file" 644 usr/share/xcalib
+    done
 }
diff --git a/srcpkgs/xclip/template b/srcpkgs/xclip/template
index daef775f5c..e7a6928841 100644
--- a/srcpkgs/xclip/template
+++ b/srcpkgs/xclip/template
@@ -1,12 +1,12 @@
 # Template file for 'xclip'
 pkgname=xclip
 version=0.12
-revision=1
+revision=2
 distfiles="${SOURCEFORGE_SITE}/xclip/xclip-${version}.tar.gz"
 checksum="b7c7fad059ba446df5692d175c2a1d3816e542549661224806db369a0d716c45"
-build_style=gnu-configure
+build_style="gnu-configure"
 makedepends="libXmu-devel"
-maintainer="Steven R <strob AT styez DOT com>"
+maintainer="Steven R <dev@styez.com>"
 homepage="http://sourceforge.net/projects/xclip/"
-license="GPLv2"
+license="GPL-2"
 short_desc="Command line interface to the X11 clipboard"
diff --git a/srcpkgs/xsel/template b/srcpkgs/xsel/template
index f32174777f..7cba2b7668 100644
--- a/srcpkgs/xsel/template
+++ b/srcpkgs/xsel/template
@@ -1,12 +1,12 @@
 # Template file for 'xsel'
 pkgname=xsel
 version=1.2.0
-revision=1
+revision=2
 distfiles="http://www.vergenet.net/~conrad/software/xsel/download/xsel-${version}.tar.gz"
 checksum="b927ce08dc82f4c30140223959b90cf65e1076f000ce95e520419ec32f5b141c"
-build_style=gnu-configure
+build_style="gnu-configure"
 makedepends="libXt-devel"
-maintainer="Steven R <strob AT styez DOT com>"
+maintainer="Steven R <dev@styez.com>"
 homepage="http://www.vergenet.net/~conrad/software/xsel/"
 license="Custom"
 short_desc="Command-line program for getting and setting the contents of the X selection"
diff --git a/srcpkgs/youtube-dl/template b/srcpkgs/youtube-dl/template
index f4b17dd5fb..12627ed4bb 100644
--- a/srcpkgs/youtube-dl/template
+++ b/srcpkgs/youtube-dl/template
@@ -1,6 +1,6 @@
 # Template file for 'youtube-dl'
 pkgname=youtube-dl
-version=2014.02.10
+version=2014.02.21.1
 revision=1
 wrksrc="${pkgname}"
 makedepends="python"
@@ -11,7 +11,7 @@ maintainer="pancake <pancake@nopcode.org>"
 license="Public Domain"
 homepage="http://rg3.github.com/youtube-dl/"
 distfiles="https://yt-dl.org/downloads/${version}/${pkgname}-${version}.tar.gz"
-checksum=fa037ae7d3a3b47f57b91e57f89689c4277465152267809811ad5bf9f76a3d3f
+checksum=ce5dc9a8c4ced4b2757916f986183936bfba0c05a3cd9217196e87275e4d2531
 
 do_install() {
 	vinstall ${pkgname} 755 usr/bin