--- a/mail/mutt/Makefile
+++ b/mail/mutt/Makefile
@@ -1,29 +1,35 @@
 #
-# Copyright (C) 2006-2008 OpenWrt.org
+# Copyright (C) 2006-2010 OpenWrt.org
 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
 #
-# $Id$
 
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=mutt
-PKG_VERSION:=1.5.16
-PKG_RELEASE:=2
+PKG_VERSION:=1.5.21
+PKG_RELEASE:=1
 
 PKG_SOURCE_URL:=@SF/mutt
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
-PKG_MD5SUM:=10eff7024dbb7ce1f773d688a69ea9db
+PKG_MD5SUM:=a29db8f1d51e2f10c070bf88e8a553fd
+
+PKG_INSTALL:=1
 
 include $(INCLUDE_DIR)/package.mk
 
 define Package/mutt
   SECTION:=mail
   CATEGORY:=Mail
-  DEPENDS:=+libopenssl +libncurses
+  DEPENDS:=+libopenssl +libncursesw
   TITLE:=Console mail client
   URL:=http://www.mutt.org/
+endef
+
+define Package/mutt/description
+	Mutt is a small but very powerful text-based mail client for Unix
+	operating systems.
 endef
 
 CONFIGURE_ARGS += \
@@ -31,11 +37,12 @@
 	--oldincludedir=$(PKG_BUILD_DIR)/. \
 	--enable-pop \
 	--enable-imap \
-	--with-ssl
+	--with-ssl \
+	--without-idn
 
 define Package/mutt/install
 	$(INSTALL_DIR) $(1)/usr/bin
-	$(CP) $(PKG_BUILD_DIR)/mutt $(1)/usr/bin/
+	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/mutt $(1)/usr/bin/
 endef
 
 $(eval $(call BuildPackage,mutt))