diff --git a/MOVED b/MOVED
index 922db8653b8b..61fc7fc25951 100644
--- a/MOVED
+++ b/MOVED
@@ -1192,7 +1192,6 @@ misc/cfe||2004-07-06|no longer exists
 devel/p5-WWW-Mechanize-FormFiller|www/p5-WWW-Mechanize-FormFiller|2004-07-09|moved to correct category (www)
 editors/moleskine||2004-07-09|project officially dead for last 1.5 years
 mail/sendmail-old|mail/sendmail811|2004-07-17|renamed
-mail/msmtp-devel|mail/msmtp|2004-07-19|mail/msmtp is now stable again
 lang/php4-dtc|lang/php4|2004-07-19|Useless with the new PHP modular infrastructure
 lang/php4-horde|lang/php4|2004-07-19|Useless with the new PHP modular infrastructure
 lang/php4-nms|lang/php4|2004-07-19|Useless with the new PHP modular infrastructure
diff --git a/mail/Makefile b/mail/Makefile
index 3a25df1d019e..ffc6f42d28ba 100644
--- a/mail/Makefile
+++ b/mail/Makefile
@@ -212,6 +212,7 @@
     SUBDIR += mreport
     SUBDIR += msgconvert
     SUBDIR += msmtp
+    SUBDIR += msmtp-devel
     SUBDIR += msmtpqueue
     SUBDIR += mulberry
     SUBDIR += mutt
diff --git a/mail/msmtp-devel/Makefile b/mail/msmtp-devel/Makefile
new file mode 100644
index 000000000000..f941ee949ffe
--- /dev/null
+++ b/mail/msmtp-devel/Makefile
@@ -0,0 +1,47 @@
+# Ports collection makefile for:  msmtp-devel
+# Date created:                   10 Jan 2005
+# Whom:                           Roman Bogorodskiy <bogorodskiy@inbox.ru>
+#
+# $FreeBSD$
+#
+
+PORTNAME=	msmtp
+PORTVERSION=	1.3.2
+CATEGORIES=	mail ipv6
+MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
+MASTER_SITE_SUBDIR=	msmtp
+PKGNAMESUFFIX=	-devel
+
+MAINTAINER=	bogorodskiy@inbox.ru
+COMMENT=	SMTP plugin for MUAs
+
+USE_BZIP2=	yes
+GNU_CONFIGURE=	yes
+USE_GETOPT_LONG=yes
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
+CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
+CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
+MAN1=		msmtp.1
+PLIST_FILES=	bin/msmtp
+
+# conflicts with mail/msmtp
+CONFLICTS=	msmtp-1.2.*
+
+.if defined(WITH_GNUTLS)
+LIB_DEPENDS+=	gnutls.12:${PORTSDIR}/security/gnutls
+CONFIGURE_ARGS+=	--with-ssl=gnutls
+.elif defined (WITH_OPENSSL)
+USE_OPENSSL=	yes
+CONFIGURE_ARGS+=	--with-ssl=openssl
+.else
+CONFIGURE_ARGS+=	--disable-ssl
+.endif
+
+.if defined(WITH_GSASL)
+LIB_DEPENDS+=	gsasl.9:${PORTSDIR}/security/gsasl
+.else
+CONFIGURE_ARGS+=	--disable-gsasl
+.endif
+
+.include <bsd.port.mk>
diff --git a/mail/msmtp-devel/distinfo b/mail/msmtp-devel/distinfo
new file mode 100644
index 000000000000..604fb67dd591
--- /dev/null
+++ b/mail/msmtp-devel/distinfo
@@ -0,0 +1,2 @@
+MD5 (msmtp-1.3.2.tar.bz2) = 8461c307baad0928c190269c74fc3133
+SIZE (msmtp-1.3.2.tar.bz2) = 162756
diff --git a/mail/msmtp-devel/pkg-descr b/mail/msmtp-devel/pkg-descr
new file mode 100644
index 000000000000..ec14dc3ef0cd
--- /dev/null
+++ b/mail/msmtp-devel/pkg-descr
@@ -0,0 +1,23 @@
+msmtp -- An SMTP client 
+
+msmtp is an SMTP client that can be used as an "SMTP plugin" for Mutt and
+probably other MUAs (mail user agents). It forwards mails to an SMTP server
+(for example at a free mail provider) which does the delivery.
+To use this program, create a configuration file with your mail account(s) and 
+tell your MUA to call msmtp instead of /usr/sbin/sendmail.
+
+Features include:
+
+    * SMTP AUTH methods PLAIN, LOGIN and CRAM-MD5
+      (and DIGEST-MD5 and NTLM when compiled with GSASL support)
+    * TLS encrypted connections
+      (including server certificate verification and the possibility to send 
+       a client certificate)
+    * DSN (Delivery Status Notification) support
+    * IPv6 support (on systems that support it)
+    * support for multiple accounts
+    * sendmail compatible exit codes (which most MUAs understand).
+
+Note: you may want to install mail/msmtpqueue - queuing support for msmtp.
+
+WWW: http://msmtp.sourceforge.net/