diff --git a/srcpkgs/awoken-icons/template b/srcpkgs/awoken-icons/template
index f53496df20f..4e9c3934ce4 100644
--- a/srcpkgs/awoken-icons/template
+++ b/srcpkgs/awoken-icons/template
@@ -1,30 +1,39 @@
 # 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/"
+  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() {
@@ -32,8 +41,7 @@ awoken-icons-dark_package() {
   short_desc+=" - Dark icons"
   noarch="yes"
   pkg_install() {
-    vmove usr/share/icons/AwOkenDark
-    vmove usr/bin/awoken-icon-theme-customization-dark
+    vmove usr/share/icons/AwOkenDark/
   }
 }
 
@@ -42,7 +50,6 @@ awoken-icons-white_package() {
   short_desc+=" - White icons"
   noarch="yes"
   pkg_install() {
-    vmove usr/share/icons/AwOkenWhite
-    vmove usr/bin/awoken-icon-theme-customization-white
+    vmove usr/share/icons/AwOkenWhite/
   }
 }