diff --git a/mail/Makefile b/mail/Makefile
index 672a06a22b37..7531998958b8 100644
--- a/mail/Makefile
+++ b/mail/Makefile
@@ -581,8 +581,8 @@
     SUBDIR += rubygem-mail25
     SUBDIR += rubygem-mailfactory
     SUBDIR += rubygem-pony
-    SUBDIR += rubygem-qmail
     SUBDIR += rubygem-rmail
+    SUBDIR += rubygem-ruby-qmail
     SUBDIR += rubygem-tmail
     SUBDIR += rubygem-vmail
     SUBDIR += sa-stats
diff --git a/mail/rubygem-qmail/Makefile b/mail/rubygem-ruby-qmail/Makefile
similarity index 79%
rename from mail/rubygem-qmail/Makefile
rename to mail/rubygem-ruby-qmail/Makefile
index 1cd8d945fab8..aa8c2811e59c 100644
--- a/mail/rubygem-qmail/Makefile
+++ b/mail/rubygem-ruby-qmail/Makefile
@@ -6,13 +6,15 @@ PORTVERSION=	0.1.1
 CATEGORIES=	mail rubygems
 MASTER_SITES=	RG
 
-MAINTAINER=	ports@FreeBSD.org
+MAINTAINER=	ruby@FreeBSD.org
 COMMENT=	Ruby qmail library
 
+LICENSE=	MIT
+
 RUN_DEPENDS=	rubygem-rspec>=1.2.9:${PORTSDIR}/devel/rubygem-rspec
 
-USE_RUBY=		yes
-USE_RUBYGEMS=		yes
+USE_RUBY=	yes
+USE_RUBYGEMS=	yes
 RUBYGEM_AUTOPLIST=	yes
 
 .include <bsd.port.mk>
diff --git a/mail/rubygem-qmail/distinfo b/mail/rubygem-ruby-qmail/distinfo
similarity index 100%
rename from mail/rubygem-qmail/distinfo
rename to mail/rubygem-ruby-qmail/distinfo
diff --git a/mail/rubygem-qmail/pkg-descr b/mail/rubygem-ruby-qmail/pkg-descr
similarity index 59%
rename from mail/rubygem-qmail/pkg-descr
rename to mail/rubygem-ruby-qmail/pkg-descr
index 86290320670c..60336e8c8de4 100644
--- a/mail/rubygem-qmail/pkg-descr
+++ b/mail/rubygem-ruby-qmail/pkg-descr
@@ -1,4 +1,4 @@
 A Ruby Qmail library to insert email directly into
 Qmail.
 
-WWW: http://rubygems.org/gems/ruby-qmail
+WWW: https://github.com/afair/ruby-qmail