diff --git a/www/Makefile b/www/Makefile
index fe961db5357d..c020eddc760a 100644
--- a/www/Makefile
+++ b/www/Makefile
@@ -1675,6 +1675,7 @@
     SUBDIR += rubygem-thin
     SUBDIR += rubygem-typhoeus
     SUBDIR += rubygem-uglifier
+    SUBDIR += rubygem-unicorn
     SUBDIR += rubygem-webmock
     SUBDIR += rubygem-webrobots
     SUBDIR += rubygem-yapra
diff --git a/www/rubygem-unicorn/Makefile b/www/rubygem-unicorn/Makefile
new file mode 100644
index 000000000000..7a2dfbf8a80c
--- /dev/null
+++ b/www/rubygem-unicorn/Makefile
@@ -0,0 +1,25 @@
+# New ports collection makefile for:	rubygem-unicorn
+# Date created:		2011-11-16
+# Whom:			Steve Wills <swills@FreeBSD.org>
+#
+# $FreeBSD$
+#
+
+PORTNAME=	unicorn
+PORTVERSION=	4.1.1
+CATEGORIES=	www rubygems
+MASTER_SITES=	RG
+
+MAINTAINER=	ruby@FreeBSD.org
+COMMENT=	Unicorn is an HTTP server for Rack applications
+
+RUN_DEPENDS=	rubygem-rack>=0:${PORTSDIR}/www/rubygem-rack \
+		rubygem-kgio>=2.4:${PORTSDIR}/devel/rubygem-kgio \
+		rubygem-raindrops>=0.6:${PORTSDIR}/www/rubygem-raindrops
+
+USE_RUBY=	yes
+USE_RUBYGEMS=	yes
+RUBYGEM_AUTOPLIST=	yes
+PLIST_FILES=	bin/unicorn bin/unicorn_rails
+
+.include <bsd.port.mk>
diff --git a/www/rubygem-unicorn/distinfo b/www/rubygem-unicorn/distinfo
new file mode 100644
index 000000000000..e6abc7e06f61
--- /dev/null
+++ b/www/rubygem-unicorn/distinfo
@@ -0,0 +1,2 @@
+SHA256 (rubygem/unicorn-4.1.1.gem) = d76ad576b97ea0236d1f0dedd7aacd791098d4add3effbf3669ce921d08bdad3
+SIZE (rubygem/unicorn-4.1.1.gem) = 247296
diff --git a/www/rubygem-unicorn/pkg-descr b/www/rubygem-unicorn/pkg-descr
new file mode 100644
index 000000000000..77eb1e1204e8
--- /dev/null
+++ b/www/rubygem-unicorn/pkg-descr
@@ -0,0 +1,7 @@
+Unicorn is an HTTP server for Rack applications designed to only serve fast
+clients on low-latency, high-bandwidth connections and take advantage of
+features in Unix/Unix-like kernels. Slow clients should only be served by
+placing a reverse proxy capable of fully buffering both the the request and
+response in between Unicorn and slow clients.
+
+WWW:	http://unicorn.bogomips.org/