diff --git a/www/Makefile b/www/Makefile
index ddd27dd9f715..2665ea976c49 100644
--- a/www/Makefile
+++ b/www/Makefile
@@ -1793,6 +1793,8 @@
     SUBDIR += rubygem-haml-coderay
     SUBDIR += rubygem-haml-contrib
     SUBDIR += rubygem-haml-rails
+    SUBDIR += rubygem-heroku
+    SUBDIR += rubygem-heroku-api
     SUBDIR += rubygem-hpricot
     SUBDIR += rubygem-html2haml
     SUBDIR += rubygem-http-cookie
diff --git a/www/rubygem-heroku-api/Makefile b/www/rubygem-heroku-api/Makefile
new file mode 100644
index 000000000000..f5c00d281551
--- /dev/null
+++ b/www/rubygem-heroku-api/Makefile
@@ -0,0 +1,17 @@
+# $FreeBSD$
+
+PORTNAME=	heroku-api
+PORTVERSION=	0.3.18
+CATEGORIES=	www rubygems
+MASTER_SITES=	RG
+
+MAINTAINER=	rpaulo@FreeBSD.org
+COMMENT=	Heroku API
+
+LICENSE=	MIT
+
+USE_RUBY=	yes
+USE_RUBYGEMS=	yes
+RUBYGEM_AUTOPLIST= yes
+
+.include <bsd.port.mk>
diff --git a/www/rubygem-heroku-api/distinfo b/www/rubygem-heroku-api/distinfo
new file mode 100644
index 000000000000..8c25e6038680
--- /dev/null
+++ b/www/rubygem-heroku-api/distinfo
@@ -0,0 +1,2 @@
+SHA256 (rubygem/heroku-api-0.3.18.gem) = 42ae5d182efff47e875d86ebf3d54f0d6261db5fc5a1c383647164d890720a99
+SIZE (rubygem/heroku-api-0.3.18.gem) = 44544
diff --git a/www/rubygem-heroku-api/pkg-descr b/www/rubygem-heroku-api/pkg-descr
new file mode 100644
index 000000000000..7dc564026f91
--- /dev/null
+++ b/www/rubygem-heroku-api/pkg-descr
@@ -0,0 +1,3 @@
+Client library to deploy and manage apps on Heroku.
+
+WWW: https://www.heroku.com
diff --git a/www/rubygem-heroku/Makefile b/www/rubygem-heroku/Makefile
new file mode 100644
index 000000000000..bd6e4b9e8f1f
--- /dev/null
+++ b/www/rubygem-heroku/Makefile
@@ -0,0 +1,30 @@
+# $FreeBSD$
+
+PORTNAME=	heroku
+PORTVERSION=	3.7.3
+CATEGORIES=	www rubygems
+MASTER_SITES=	RG
+
+MAINTAINER=	rpaulo@FreeBSD.org
+COMMENT=	Heroku Client
+
+LICENSE=	MIT
+
+USE_RUBY=	yes
+USE_RUBYGEMS=	yes
+RUBYGEM_AUTOPLIST= yes
+
+PLIST_FILES=	bin/heroku
+
+RUN_DEPENDS+=	rubygem-heroku-api>=0:${PORTSDIR}/www/rubygem-heroku-api \
+		rubygem-excon>=0:${PORTSDIR}/devel/rubygem-excon \
+		rubygem-multi_json>=0:${PORTSDIR}/devel/rubygem-multi_json \
+		rubygem-launchy>=0:${PORTSDIR}/devel/rubygem-launchy \
+		rubygem-netrc>=0:${PORTSDIR}/net/rubygem-netrc \
+		rubygem-rest-client>=0:${PORTSDIR}/www/rubygem-rest-client \
+		rubygem-rqrcode>=0:${PORTSDIR}/www/rubygem-rqrcode \
+		rubygem-rubyzip>=0:${PORTSDIR}/archivers/rubygem-rubyzip \
+		rubygem-term-ansicolor>=0:${PORTSDIR}/devel/rubygem-term-ansicolor \
+		rubygem-tins>=0:${PORTSDIR}/devel/rubygem-tins
+
+.include <bsd.port.mk>
diff --git a/www/rubygem-heroku/distinfo b/www/rubygem-heroku/distinfo
new file mode 100644
index 000000000000..ba3780f45407
--- /dev/null
+++ b/www/rubygem-heroku/distinfo
@@ -0,0 +1,2 @@
+SHA256 (rubygem/heroku-3.7.3.gem) = 9f8c4f96f642d18b52ff99b4eadc565b56593390b55c9fe3614f61f01a00be67
+SIZE (rubygem/heroku-3.7.3.gem) = 245760
diff --git a/www/rubygem-heroku/pkg-descr b/www/rubygem-heroku/pkg-descr
new file mode 100644
index 000000000000..e6f191b9d68e
--- /dev/null
+++ b/www/rubygem-heroku/pkg-descr
@@ -0,0 +1,3 @@
+Command-line tool to deploy and manage apps on Heroku.
+
+WWW: https://www.heroku.com