diff --git a/srcpkgs/mailx/patches/mailx-12.3-pager.patch b/srcpkgs/mailx/patches/mailx-12.3-pager.patch
new file mode 100644
index 00000000000..d4b243929cf
--- /dev/null
+++ b/srcpkgs/mailx/patches/mailx-12.3-pager.patch
@@ -0,0 +1,12 @@
+diff -Nrbu mailx-12.3/cmd1.c mailx-12.3-OK/cmd1.c
+--- mailx-12.3/cmd1.c	2007-06-16 16:48:39.000000000 +0400
++++ mailx-12.3-OK/cmd1.c	2008-06-26 19:57:38.000000000 +0400
+@@ -78,7 +78,7 @@
+ 
+ 	cp = value("PAGER");
+ 	if (cp == NULL || *cp == '\0')
+-		cp = value("bsdcompat") ? "more" : "pg";
++		cp = value("bsdcompat") ? "more" : "less";
+ 	return cp;
+ }
+ 
diff --git a/srcpkgs/mailx/patches/nail-11.25-config.patch b/srcpkgs/mailx/patches/nail-11.25-config.patch
new file mode 100644
index 00000000000..b1dd7e09edd
--- /dev/null
+++ b/srcpkgs/mailx/patches/nail-11.25-config.patch
@@ -0,0 +1,11 @@
+diff -Nrbu nail-11.25/nail.rc nail-11.25-OK/nail.rc
+--- nail-11.25/nail.rc	2005-01-15 17:33:16.000000000 +0300
++++ nail-11.25-OK/nail.rc	2005-08-19 16:55:09.000000000 +0400
+@@ -60,3 +60,7 @@
+ 
+ # Only include selected header fields when forwarding messages.
+ fwdretain subject date from to
++
++# For Linux and BSD, this should be set.
++set bsdcompat
++
diff --git a/srcpkgs/mailx/template b/srcpkgs/mailx/template
new file mode 100644
index 00000000000..00393a59590
--- /dev/null
+++ b/srcpkgs/mailx/template
@@ -0,0 +1,62 @@
+# Template file for 'mailx'
+pkgname=mailx
+version=12.5
+patch_args="-Np1"
+wrksrc=mailx-${version}
+distfiles="http://cvs.fedoraproject.org/repo/pkgs/mailx/mailx-${version}.tar.bz2/acea6f7e8ae727514e498bd8c1895363/mailx-${version}.tar.bz2"
+build_style=custom-install
+short_desc="Feature-rich BSD mail(1)"
+maintainer="Juan RP <xtraeme@gmail.com>"
+checksum=c33dc81aaa6136645310c406d61d9b1d7c0a54d424bafe2d1c266e256526afe2
+long_desc="
+ Mailx is an enhanced mail command, which provides the functionality
+ of the POSIX mailx command, as well as SysV mail and Berkeley Mail
+ (from which it is derived).
+
+ Additionally to the POSIX features, mailx can work with Maildir/ e-mail
+ storage format (as well as mailboxes), supports IMAP, POP3 and SMTP
+ procotols (including over SSL) to operate with remote hosts, handles mime
+ types and different charsets. There are a lot of other useful features,
+ see mailx(1).
+
+ And as its ancient analogues, mailx can be used as a mail script language,
+ both for sending and receiving mail.
+
+ Besides the "mailx" command, this package provides "mail" and "Mail"
+ (which should be compatible with its predecessors from the mailx-8.x source),
+ as well as "nail" (the initial name of this project)."
+
+conf_files="/etc/mail.rc"
+disable_parallel_build=yes
+
+Add_dependency run glibc
+Add_dependency run libssl
+Add_dependency run mit-krb5-libs
+Add_dependency build openssl-devel
+Add_dependency build mit-krb5-devel
+
+do_build()
+{
+	echo	PREFIX=/usr 		\
+		BINDIR=/bin 		\
+		MANDIR=/usr/share/man	\
+		SYSCONFDIR=/etc		\
+		MAILRC=/etc/mail.rc	\
+		MAILSPOOL=/var/spool/mail	\
+		UCBINSTALL=install	\
+	> ${wrksrc}/makeflags
+
+	make $(cat makeflags) CFLAGS="${XBPS_CFLAGS} -D_GNU_SOURCE" \
+		IPv6=-DHAVE_IPv6_FUNCS || return 1
+}
+
+do_install()
+{
+	make DESTDIR=${DESTDIR} $(cat makeflags) install || return 1
+
+	cd ${wrksrc} && \
+		ln -s mailx ${DESTDIR}/bin/mail && \
+		ln -s mailx ${DESTDIR}/bin/Mail && \
+		ln -s mailx.1 ${DESTDIR}/usr/share/man/man1/mail.1 && \
+		ln -s mailx.1 ${DESTDIR}/usr/share/man/man1/Mail.1
+}