diff --git a/textproc/ruby-treetop/Makefile b/textproc/ruby-treetop/Makefile
index 2bd944474258..05ae1c0fa91d 100644
--- a/textproc/ruby-treetop/Makefile
+++ b/textproc/ruby-treetop/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2014/03/15 15:15:06 taca Exp $
+# $NetBSD: Makefile,v 1.8 2016/11/19 15:24:45 taca Exp $
 
 DISTNAME=	treetop-1.4.15
 CATEGORIES=	textproc
@@ -11,6 +11,7 @@ LICENSE=	mit
 DEPENDS+=	${RUBY_PKGPREFIX}-polyglot>=0.3.1:../../devel/ruby-polyglot
 
 CONFLICTS=	ruby[1-9][0-9]-treetop-[0-9]*
+OVERRIDE_GEMSPEC+=	polyglot:
 
 .include "../../lang/ruby/gem.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/textproc/ruby-treetop/patches/patch-.._treetop-1.4.15.gemspec b/textproc/ruby-treetop/patches/patch-.._treetop-1.4.15.gemspec
deleted file mode 100644
index 4f5408950637..000000000000
--- a/textproc/ruby-treetop/patches/patch-.._treetop-1.4.15.gemspec
+++ /dev/null
@@ -1,30 +0,0 @@
-$NetBSD: patch-.._treetop-1.4.15.gemspec,v 1.1 2015/05/19 12:32:55 ryoon Exp $
-
-* Fix build with Ruby 2.2.
-
---- ../treetop-1.4.15.gemspec.orig	2015-05-19 12:27:49.000000000 +0000
-+++ ../treetop-1.4.15.gemspec
-@@ -30,7 +30,6 @@ Gem::Specification.new do |s|
-       s.add_development_dependency(%q<rr>, ["~> 1.0"])
-       s.add_development_dependency(%q<rspec>, [">= 2.0.0"])
-       s.add_development_dependency(%q<rake>, [">= 0"])
--      s.add_runtime_dependency(%q<polyglot>, [">= 0.3.1"])
-     else
-       s.add_dependency(%q<polyglot>, [">= 0"])
-       s.add_dependency(%q<jeweler>, [">= 0"])
-@@ -39,7 +38,6 @@ Gem::Specification.new do |s|
-       s.add_dependency(%q<rr>, ["~> 1.0"])
-       s.add_dependency(%q<rspec>, [">= 2.0.0"])
-       s.add_dependency(%q<rake>, [">= 0"])
--      s.add_dependency(%q<polyglot>, [">= 0.3.1"])
-     end
-   else
-     s.add_dependency(%q<polyglot>, [">= 0"])
-@@ -49,7 +47,6 @@ Gem::Specification.new do |s|
-     s.add_dependency(%q<rr>, ["~> 1.0"])
-     s.add_dependency(%q<rspec>, [">= 2.0.0"])
-     s.add_dependency(%q<rake>, [">= 0"])
--    s.add_dependency(%q<polyglot>, [">= 0.3.1"])
-   end
- end
-