diff --git a/srcpkgs/irssi-otr b/srcpkgs/irssi-otr
new file mode 120000
index 00000000000..12532cbc9b1
--- /dev/null
+++ b/srcpkgs/irssi-otr
@@ -0,0 +1 @@
+irssi
\ No newline at end of file
diff --git a/srcpkgs/irssi-otr/template b/srcpkgs/irssi-otr/template
deleted file mode 100644
index 6a6c10cdf3e..00000000000
--- a/srcpkgs/irssi-otr/template
+++ /dev/null
@@ -1,25 +0,0 @@
-# Template file for 'irssi-otr'
-pkgname=irssi-otr
-version=1.0.2
-revision=1
-build_style=gnu-configure
-configure_args="--with-gnu-ld
- --with-irssi-headers=${XBPS_CROSS_BASE}/usr/include/irssi
- --oldincludedir=${XBPS_CROSS_BASE}/usr/include"
-hostmakedepends="autoconf automake libtool m4 pkg-config"
-makedepends="glib-devel irssi-devel libgcrypt-devel libotr-devel"
-short_desc="Off-the-Record Messaging (OTR) for the Irssi IRC client"
-maintainer="Andy Weidenbaum <archbaum@gmail.com>"
-license="GPL-2.0-or-later"
-homepage="https://github.com/cryptodotis/irssi-otr"
-changelog="https://raw.githubusercontent.com/cryptodotis/irssi-otr/master/ChangeLog"
-distfiles="https://github.com/cryptodotis/irssi-otr/archive/v${version}.tar.gz"
-checksum=4619208b9c9171aa97a41960b3e892390b6473e2988a056b9fe8e110daa1ae9c
-
-pre_configure() {
-	autoreconf -fi -I ${XBPS_CROSS_BASE}/usr/share/aclocal
-}
-
-post_install() {
-	vdoc README.md
-}
diff --git a/srcpkgs/irssi/template b/srcpkgs/irssi/template
index 86e306c9ada..c8f205faad3 100644
--- a/srcpkgs/irssi/template
+++ b/srcpkgs/irssi/template
@@ -1,11 +1,11 @@
 # Template file for 'irssi'
 pkgname=irssi
 version=1.2.0
-revision=1
+revision=2
 build_style=gnu-configure
-configure_args="--disable-static --with-proxy --enable-true-color"
+configure_args="--disable-static --with-proxy --enable-true-color --with-otr"
 hostmakedepends="pkg-config"
-makedepends="libglib-devel libressl-devel ncurses-devel"
+makedepends="libglib-devel libressl-devel ncurses-devel libgcrypt-devel libotr-devel"
 depends="ca-certificates"
 conf_files="/etc/irssi.conf"
 short_desc="Secure and modular IRC client with text mode user interface"
@@ -16,7 +16,7 @@ distfiles="https://github.com/irssi/irssi/releases/download/${version}/irssi-${v
 checksum=350dfc5fd8db881e6f1982da0466900b5b175527e9a94d69ada0b7e90a73e3ea
 
 LDFLAGS="-lncursesw"
-subpackages="irssi-devel"
+subpackages="irssi-devel irssi-otr"
 
 if [ -z "$CROSS_BUILD" ]; then
 	configure_args+=" --with-perl=module"
@@ -34,6 +34,14 @@ irssi-perl_package() {
 	}
 }
 
+irssi-otr_package() {
+	depends="irssi"
+	short_desc+=" - OTR support"
+	pkg_install() {
+		vmove "usr/lib/irssi/modules/*otr*"
+	}
+}
+
 irssi-devel_package() {
 	depends="${makedepends}"
 	short_desc+=" - development files"