diff --git a/mail/mutt/Makefile b/mail/mutt/Makefile
index 856b58eeb..99d380409 100644
--- a/mail/mutt/Makefile
+++ b/mail/mutt/Makefile
@@ -9,12 +9,12 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=mutt
-PKG_VERSION:=1.5.16
-PKG_RELEASE:=2
+PKG_VERSION:=1.5.18
+PKG_RELEASE:=1
 
 PKG_SOURCE_URL:=@SF/mutt
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
-PKG_MD5SUM:=10eff7024dbb7ce1f773d688a69ea9db
+PKG_MD5SUM:=27c30037120189b9f9c0d3e76361b8f8
 
 include $(INCLUDE_DIR)/package.mk
 
diff --git a/mail/mutt/patches/001-no_po_and_docs.patch b/mail/mutt/patches/001-no_po_and_docs.patch
new file mode 100644
index 000000000..52fd4ccf7
--- /dev/null
+++ b/mail/mutt/patches/001-no_po_and_docs.patch
@@ -0,0 +1,11 @@
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -287,7 +287,7 @@
+ AUTOMAKE_OPTIONS = 1.6 foreign
+ @BUILD_IMAP_TRUE@IMAP_SUBDIR = imap
+ @BUILD_IMAP_TRUE@IMAP_INCLUDES = -I$(top_srcdir)/imap
+-SUBDIRS = m4 po intl doc contrib $(IMAP_SUBDIR)
++SUBDIRS = m4 intl contrib $(IMAP_SUBDIR)
+ bin_SCRIPTS = muttbug flea @SMIMEAUX_TARGET@
+ BUILT_SOURCES = keymap_defs.h patchlist.c reldate.h hcversion.h
+ mutt_SOURCES = \