diff --git a/www/rubygem-em-twitter/Makefile b/www/rubygem-em-twitter/Makefile
index 9138ec9a38ee..a26c3878bf0a 100644
--- a/www/rubygem-em-twitter/Makefile
+++ b/www/rubygem-em-twitter/Makefile
@@ -1,23 +1,24 @@
 # Created by: TAKATSU Tomonari <tota@FreeBSD.org>
 
 PORTNAME=	em-twitter
 PORTVERSION=	0.3.5
 CATEGORIES=	www rubygems
 MASTER_SITES=	RG
 
 MAINTAINER=	ruby@FreeBSD.org
 COMMENT=	Twitter Streaming API client for EventMachine
 
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE.md
 
-RUN_DEPENDS=	rubygem-buftok>=0.2:devel/rubygem-buftok \
-		rubygem-eventmachine>=1.0:devel/rubygem-eventmachine \
-		rubygem-http_parser.rb>=0.6:net/rubygem-http_parser.rb \
-		rubygem-simple_oauth>=0.2:net/rubygem-simple_oauth
+RUN_DEPENDS=	rubygem-buftok>=0.2<1:devel/rubygem-buftok \
+		rubygem-eventmachine>=1.0<2:devel/rubygem-eventmachine \
+		rubygem-http_parser.rb>=0.6<1:net/rubygem-http_parser.rb \
+		rubygem-simple_oauth>=0.2<1:net/rubygem-simple_oauth
 
-NO_ARCH=	yes
-USE_RUBY=	yes
 USES=		gem
+USE_RUBY=	yes
+
+NO_ARCH=	yes
 
 .include <bsd.port.mk>
diff --git a/www/rubygem-em-twitter/pkg-descr b/www/rubygem-em-twitter/pkg-descr
index 3a7fa409b75d..9ab56c275865 100644
--- a/www/rubygem-em-twitter/pkg-descr
+++ b/www/rubygem-em-twitter/pkg-descr
@@ -1,4 +1,4 @@
 EM-Twitter is an EventMachine-based ruby client for the Twitter
 Streaming API.
 
-WWW: https://github.com/spagalloco/em-twitter
+WWW: https://github.com/tweetstream/em-twitter