diff --git a/mail/rubygem-vmail/Makefile b/mail/rubygem-vmail/Makefile
index 5812d6126d47..d561c105c7ea 100644
--- a/mail/rubygem-vmail/Makefile
+++ b/mail/rubygem-vmail/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	vmail
 PORTVERSION=	2.9.5
+PORTREVISION=	1
 CATEGORIES=	mail rubygems
 MASTER_SITES=	RG
 
@@ -17,7 +18,7 @@ RUN_DEPENDS=	rubygem-highline>=1.6.1:devel/rubygem-highline \
 		rubygem-sequel>=3.24.1:devel/rubygem-sequel \
 		rubygem-sqlite3>=1.3.3:databases/rubygem-sqlite3 \
 		rubygem-versionomy>=0.4.4:devel/rubygem-versionomy \
-		${LOCALBASE}/bin/vim:editors/vim-lite
+		vim:editors/vim-lite
 
 NO_ARCH=	yes
 USE_RUBY=	yes
diff --git a/mail/rubygem-vmail/files/patch-gemspec b/mail/rubygem-vmail/files/patch-gemspec
new file mode 100644
index 000000000000..eac6ceeb1972
--- /dev/null
+++ b/mail/rubygem-vmail/files/patch-gemspec
@@ -0,0 +1,11 @@
+--- vmail.gemspec.orig	2016-04-07 12:46:56 UTC
++++ vmail.gemspec
+@@ -26,7 +26,7 @@ Gem::Specification.new do |s|
+     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
+       s.add_runtime_dependency(%q<mail>.freeze, [">= 2.2.12", "~> 2.2"])
+       s.add_runtime_dependency(%q<highline>.freeze, [">= 1.6.1", "~> 1.6"])
+-      s.add_runtime_dependency(%q<sequel>.freeze, [">= 3.24.1", "~> 3.24"])
++      s.add_runtime_dependency(%q<sequel>.freeze, [">= 3.24.1"])
+       s.add_runtime_dependency(%q<sqlite3>.freeze, [">= 1.3.3", "~> 1.3"])
+       s.add_runtime_dependency(%q<versionomy>.freeze, [">= 0.4.4", "~> 0.4"])
+     else