diff --git a/openwrt/package/Config.in b/openwrt/package/Config.in
index 05e7da6385..8cea28903a 100644
--- a/openwrt/package/Config.in
+++ b/openwrt/package/Config.in
@@ -180,6 +180,7 @@ source "package/vrrpd/Config.in"
 source "package/vsftpd/Config.in"
 source "package/vtun/Config.in"
 source "package/wccpd/Config.in"
+source "package/weechat/Config.in"
 source "package/wificonf/Config.in"
 source "package/wifidog/Config.in"
 source "package/wireless-tools/Config.in"
diff --git a/openwrt/package/Makefile b/openwrt/package/Makefile
index 0004c0e4cb..4da2eb1874 100644
--- a/openwrt/package/Makefile
+++ b/openwrt/package/Makefile
@@ -269,6 +269,7 @@ package-$(BR2_PACKAGE_VTUN) += vtun
 package-$(BR2_PACKAGE_VSFTPD) += vsftpd
 package-$(BR2_PACKAGE_WATCHDOG) += watchdog
 package-$(BR2_PACKAGE_WCCPD) += wccpd
+package-$(BR2_PACKAGE_WEECHAT) += weechat
 package-$(BR2_PACKAGE_WIFICONF) += wificonf
 package-$(BR2_PACKAGE_WIFIDOG) += wifidog
 package-$(BR2_PACKAGE_WIVIZ) += wiviz
diff --git a/openwrt/package/depend.mk b/openwrt/package/depend.mk
index 8e4eb56717..cbf75d4471 100644
--- a/openwrt/package/depend.mk
+++ b/openwrt/package/depend.mk
@@ -106,6 +106,7 @@ vncrepeater-compile: uclibc++-compile
 vnc-reflector-compile: jpeg-compile zlib-compile
 vpnc-compile: libgcrypt-compile libgpg-error-compile
 vtun-compile: zlib-compile openssl-compile liblzo-compile
+weechat-compile: ncurses-compile gnutls-compile lua-compile
 wificonf-compile: wireless-tools-compile nvram-compile
 wiviz-compile: libpcap-compile
 wknock-compile: libpcap-compile
diff --git a/openwrt/package/weechat/Config.in b/openwrt/package/weechat/Config.in
new file mode 100644
index 0000000000..ea24124cbf
--- /dev/null
+++ b/openwrt/package/weechat/Config.in
@@ -0,0 +1,25 @@
+menu "weechat................................. Lightweight IRC client"
+
+config BR2_PACKAGE_WEECHAT
+	prompt "weechat.......................... Lightweight IRC client"
+	tristate
+	default m if CONFIG_DEVEL
+	select BR2_PACKAGE_LIBNCURSES
+	help
+	  Fast, light & extensible IRC client
+
+	  http://weechat.flashtux.org
+
+config BR2_COMPILE_WEECHAT_WITH_TLS
+	prompt "Enable TLS support"
+	bool
+	select BR2_PACKAGE_GNUTLS
+	depends BR2_PACKAGE_WEECHAT
+
+config BR2_COMPILE_WEECHAT_WITH_LUA
+	prompt "Enable LUA scripting"
+	bool
+	select BR2_PACKAGE_LIBLUA
+	depends BR2_PACKAGE_WEECHAT
+
+endmenu
diff --git a/openwrt/package/weechat/Makefile b/openwrt/package/weechat/Makefile
new file mode 100644
index 0000000000..35ddae5706
--- /dev/null
+++ b/openwrt/package/weechat/Makefile
@@ -0,0 +1,76 @@
+# $Id: buildroot-documentation.html,v 1.7.4.3 2005/09/04 10:44:06 wbx Exp $
+
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:=weechat
+PKG_VERSION:=0.1.8
+PKG_RELEASE:=1
+PKG_MD5SUM:=73d6bc211ac32c597f0d278506480a20
+
+PKG_SOURCE_URL:=http://weechat.flashtux.org/download/
+PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
+PKG_CAT:=zcat
+
+PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
+PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install
+
+include $(TOPDIR)/package/rules.mk
+
+$(eval $(call PKG_template,WEECHAT,$(PKG_NAME),$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH)))
+
+PKG_DEPEND:=libncurses
+
+ifeq ($(BR2_COMPILE_WEECHAT_WITH_TLS),y)
+ENABLE_TLS:=--with-libgnutls-prefix=$(STAGING_DIR)/usr
+PKG_DEPEND += , gnutls
+else
+ENABLE_TLS:=--disable-gnutls
+endif
+
+ifneq ($(BR2_COMPILE_WEECHAT_WITH_LUA),y)
+DISABLE_LUA:=--disable-lua
+else
+PKG_DEPEND+=, liblua
+endif
+
+
+$(PKG_BUILD_DIR)/.configured: $(PKG_BUILD_DIR)/.prepared
+	(cd $(PKG_BUILD_DIR); \
+	$(TARGET_CONFIGURE_OPTS) \
+	CFLAGS="$(TARGET_CFLAGS)" \
+	CPPFLAGS="-I$(STAGING_DIR)/usr/include" \
+	LDFLAGS="-L$(STAGING_DIR)/usr/lib" \
+	./configure \
+		--target=$(GNU_TARGET_NAME) \
+		--host=$(GNU_TARGET_NAME) \
+		--build=$(GNU_HOST_NAME) \
+		--prefix=/usr \
+		--sysconfdir=/etc \
+		--disable-nls \
+		$(ENABLE_TLS) \
+		--with-debug=0 \
+		--disable-perl \
+		--disable-python \
+		--disable-ruby \
+		$(DISABLE_LUA) \
+	);
+	touch $@
+
+$(PKG_BUILD_DIR)/.built:
+	rm -rf $(PKG_INSTALL_DIR)
+	mkdir -p $(PKG_INSTALL_DIR)
+	$(MAKE) -C $(PKG_BUILD_DIR) \
+		DESTDIR="$(PKG_INSTALL_DIR)" \
+	all install
+	touch $@
+
+$(IPKG_WEECHAT):
+	install -d -m0755 $(IDIR_WEECHAT)/usr/bin
+	cp -fpR $(PKG_INSTALL_DIR)/usr/bin/weechat-curses $(IDIR_WEECHAT)/usr/bin
+	echo "Depends: $(PKG_DEPEND)" >> $(IDIR_WEECHAT)/CONTROL/control
+	$(RSTRIP) $(IDIR_WEECHAT)
+	$(IPKG_BUILD) $(IDIR_WEECHAT) $(PACKAGE_DIR)
+  
+mostlyclean:
+	make -C $(PKG_BUILD_DIR) clean
+	rm $(PKG_BUILD_DIR)/.built
diff --git a/openwrt/package/weechat/ipkg/weechat.control b/openwrt/package/weechat/ipkg/weechat.control
new file mode 100644
index 0000000000..81a2bec6ca
--- /dev/null
+++ b/openwrt/package/weechat/ipkg/weechat.control
@@ -0,0 +1,4 @@
+Package: weechat
+Section: net
+Priority: optional
+Description: Lightweight IRC client