diff --git net-im/mikutter/Makefile net-im/mikutter/Makefile
index fd65fbf..d8a95b3 100644
--- net-im/mikutter/Makefile
+++ net-im/mikutter/Makefile
@@ -34,7 +34,7 @@ RUN_DEPENDS=	rubygem-gtk2>=3.1.8:x11-toolkits/rubygem-gtk2 \
 		rubygem-ruby-hmac>=0.4.0:security/rubygem-ruby-hmac \
 		rubygem-text>=1.3.1:textproc/rubygem-text \
 		rubygem-totoridipjp>=0.1.0:www/rubygem-totoridipjp \
-		rubygem-twitter-text>=1.14.5:textproc/rubygem-twitter-text \
+		rubygem-twitter-text>=2.1.0:textproc/rubygem-twitter-text \
 		rubygem-typed-array>=0.1.2:devel/rubygem-typed-array \
 		rubygem-unf>=0.1.4:textproc/rubygem-unf
 
diff --git net-im/mikutter/files/patch-issue-1130 net-im/mikutter/files/patch-issue-1130
new file mode 100644
index 0000000..65e97c0
--- /dev/null
+++ net-im/mikutter/files/patch-issue-1130
@@ -0,0 +1,11 @@
+--- core/mui/gtk_postbox.rb.orig	2017-10-08 12:29:16 UTC
++++ core/mui/gtk_postbox.rb
+@@ -290,7 +290,7 @@ module Gtk
+     def remain_charcount
+       if not widget_post.destroyed?
+         text = trim_hidden_regions(widget_post.buffer.text + UserConfig[:footer])
+-        Twitter::Extractor.extract_urls(text).map{|url|
++        Twitter::TwitterText::Extractor.extract_urls(text).map{|url|
+           if url.length < posted_url_length(url)
+             -(posted_url_length(url) - url.length)
+           else