diff --git a/srcpkgs/irssi/irssi-devel.template b/srcpkgs/irssi/irssi-devel.template
index 70c323bf660..2530cba0db4 100644
--- a/srcpkgs/irssi/irssi-devel.template
+++ b/srcpkgs/irssi/irssi-devel.template
@@ -1,18 +1,12 @@
 # Template file for 'irssi-devel'.
 #
-depends="perl pkg-config glib-devel openssl-devel ncurses-devel irssi"
+depends="perl>=5.16 glib-devel openssl-devel ncurses-devel"
 short_desc="${short_desc} (development files)"
 long_desc="${long_desc}
 
  This package contains files for development, headers, static libs, etc."
 
-
-
-do_install()
-{
-	mkdir -p ${DESTDIR}/usr/lib/irssi/modules
-
-	mv ${SRCPKGDESTDIR}/usr/include ${DESTDIR}/usr
-	mv ${SRCPKGDESTDIR}/usr/lib/irssi/modules/*.*a \
-		${DESTDIR}/usr/lib/irssi/modules
+do_install() {
+	vmove usr/include usr
+	vmove "usr/lib/irssi/modules/*.a" usr/lib/irssi/modules
 }
diff --git a/srcpkgs/irssi/irssi-perl.template b/srcpkgs/irssi/irssi-perl.template
index 0b688cd2dbb..4e032d66be1 100644
--- a/srcpkgs/irssi/irssi-perl.template
+++ b/srcpkgs/irssi/irssi-perl.template
@@ -1,22 +1,14 @@
 # Template file for 'irssi-perl'.
 #
-depends="irssi"
+depends="perl>=5.16 irssi>=$version"
 short_desc="${sourcepkg} perl support"
 long_desc="${long_desc}
 
  This package contains the modules to enable perl support with the
  irssi package, and related perl scripts included."
 
-
-
-do_install()
-{
-	mkdir -p ${DESTDIR}/usr/lib/irssi/modules
-	mkdir -p ${DESTDIR}/usr/share/irssi
-
-	mv ${SRCPKGDESTDIR}/usr/lib/perl5 ${DESTDIR}/usr/lib
-	mv ${SRCPKGDESTDIR}/usr/lib/irssi/modules/*perl* \
-		${DESTDIR}/usr/lib/irssi/modules
-	mv ${SRCPKGDESTDIR}/usr/share/irssi/scripts \
-		${DESTDIR}/usr/share/irssi
+do_install() {
+	vmove usr/lib/perl5 usr/lib
+	vmove "usr/lib/irssi/modules/*perl*" usr/lib/irssi/modules
+	vmove usr/share/irssi/scripts usr/share/irssi
 }
diff --git a/srcpkgs/irssi/template b/srcpkgs/irssi/template
index 1165df58e97..0203b427af1 100644
--- a/srcpkgs/irssi/template
+++ b/srcpkgs/irssi/template
@@ -1,14 +1,17 @@
 # Template build file for 'irssi'
 pkgname=irssi
 version=0.8.15
-revision=4
-distfiles="http://www.irssi.org/files/$pkgname-$version.tar.bz2"
+revision=5
 configure_args="--with-proxy --with-perl=module"
 build_style=gnu-configure
-depends="zlib"
-makedepends="perl pkg-config zlib-devel glib-devel openssl-devel ncurses-devel"
+makedepends="perl>=5.16 pkg-config glib-devel openssl-devel ncurses-devel"
+conf_files="/etc/irssi.conf"
+subpackages="irssi-devel irssi-perl"
+homepage="http://www.irssi.org"
 short_desc="Secure and modular IRC client with text mode user interface"
 maintainer="Juan RP <xtraeme@gmail.com>"
+license="GPL-2"
+distfiles="http://www.irssi.org/files/$pkgname-$version.tar.bz2"
 checksum=c12d16fb605103d7c256ddce44012dc396af57f3771e086d0387c195a052a0a6
 long_desc="
  Irssi is a modular IRC client that currently has only text mode user
@@ -16,8 +19,3 @@ long_desc="
  could be created pretty easily. Also, Irssi isn't really even IRC specific
  anymore, there's already a working SILC module available. Support for other
  protocols like ICQ could be created some day too."
-
-conf_files="/etc/irssi.conf"
-subpackages="irssi-devel irssi-perl"
-
-