diff --git a/srcpkgs/weechat/patches/ruby-2.1.patch b/srcpkgs/weechat/patches/ruby-2.1.patch
deleted file mode 100644
index 06212a60e1..0000000000
--- a/srcpkgs/weechat/patches/ruby-2.1.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- cmake/FindRuby.cmake-       2014-07-22 11:38:14.145190665 +0200
-+++ cmake/FindRuby.cmake        2014-07-22 11:36:15.294186414 +0200
-@@ -33,7 +33,7 @@
- 
- FIND_PACKAGE(PkgConfig)
- IF(PKG_CONFIG_FOUND)
--  pkg_search_module(RUBY ruby-2.0 ruby-1.9 ruby-1.8)
-+  pkg_search_module(RUBY ruby-2.1 ruby-2.0 ruby-1.9 ruby-1.8)
- ENDIF(PKG_CONFIG_FOUND)
- 
- IF(RUBY_FOUND)
diff --git a/srcpkgs/weechat/template b/srcpkgs/weechat/template
index 980afdc320..d6323d3842 100644
--- a/srcpkgs/weechat/template
+++ b/srcpkgs/weechat/template
@@ -1,19 +1,24 @@
 # Template file for 'weechat'
 pkgname=weechat
-version=0.4.3
-revision=6
+version=1.0
+revision=1
 lib32disabled=yes
 build_style=cmake
 hostmakedepends="cmake pkg-config python-devel libgcrypt-devel tcl-devel>=8.6"
 makedepends="tcl-devel>=8.6 aspell-devel libgcrypt-devel gnutls-devel>=3.1.5
- python-devel ruby-devel>=2.1 lua-devel>=5.2 libcurl-devel perl>=5.18 ca-certificates"
+ python-devel ruby-devel>=2.1 lua-devel>=5.2 libcurl-devel perl>=5.18"
 depends="ca-certificates"
 short_desc="Fast, light and extensible IRC client (curses UI)"
 maintainer="Juan RP <xtraeme@gmail.com>"
 license="GPL-3"
 homepage="http://www.weechat.org"
 distfiles="${homepage}/files/src/$pkgname-$version.tar.bz2"
-checksum=a8ec847d331a1201de975530a22f1813c260db420c68675b2ecaa7bf3c7c3ff8
+checksum=82563f222df3a8b3381216d4e97e02bff79b8d836d4dac0eb08ff75bde83cb3d
+
+subpackages="weechat-aspell weechat-devel weechat-ruby weechat-python weechat-tcl weechat-lua"
+if [ -z "$CROSS_BUILD" ]; then
+	subpackages+=" weechat-perl"
+fi
 
 weechat-aspell_package() {
 	lib32disabled=yes
@@ -34,7 +39,6 @@ weechat-devel_package() {
 	}
 }
 
-if [ -z "$CROSS_BUILD" ]; then
 weechat-perl_package() {
 	lib32disabled=yes
 	depends="${sourcepkg}-${version}_${revision}"
@@ -43,7 +47,6 @@ weechat-perl_package() {
 		vmove usr/lib/weechat/plugins/perl.so
 	}
 }
-fi # fails to build right now
 
 weechat-ruby_package() {
 	lib32disabled=yes