diff --git a/www/ruby-puma/Makefile b/www/ruby-puma/Makefile
new file mode 100644
index 00000000000..de8ce18dcec
--- /dev/null
+++ b/www/ruby-puma/Makefile
@@ -0,0 +1,18 @@
+# $OpenBSD: Makefile,v 1.1.1.1 2015/07/16 21:37:45 jeremy Exp $
+
+COMMENT =		simple, fast, threaded webserver for rack applications
+
+DISTNAME =		puma-2.12.1
+CATEGORIES =		www
+
+HOMEPAGE =		http://puma.io/
+
+# BSD
+PERMIT_PACKAGE_CDROM =	Yes
+
+MODULES =		lang/ruby
+
+WANTLIB =		crypto ssl
+CONFIGURE_STYLE =	ruby gem ext
+
+.include <bsd.port.mk>
diff --git a/www/ruby-puma/distinfo b/www/ruby-puma/distinfo
new file mode 100644
index 00000000000..819b2d01a69
--- /dev/null
+++ b/www/ruby-puma/distinfo
@@ -0,0 +1,2 @@
+SHA256 (puma-2.12.1.gem) = UuB+REV84vum8k6a9FWvq8ssCJRplPVw8+AxG96Oa48=
+SIZE (puma-2.12.1.gem) = 95232
diff --git a/www/ruby-puma/pkg/DESCR b/www/ruby-puma/pkg/DESCR
new file mode 100644
index 00000000000..9c0557289f9
--- /dev/null
+++ b/www/ruby-puma/pkg/DESCR
@@ -0,0 +1,3 @@
+Unlike other Ruby Webservers, Puma was built for speed and parallelism. Puma is
+a small library that provides a very fast and concurrent HTTP 1.1 server for
+Ruby web applications. It is designed for running Rack apps only.
diff --git a/www/ruby-puma/pkg/PLIST b/www/ruby-puma/pkg/PLIST
new file mode 100644
index 00000000000..f492dd97a10
--- /dev/null
+++ b/www/ruby-puma/pkg/PLIST
@@ -0,0 +1,80 @@
+@comment $OpenBSD: PLIST,v 1.1.1.1 2015/07/16 21:37:45 jeremy Exp $
+${GEM_BIN}/puma${GEM_BIN_SUFFIX}
+${GEM_BIN}/pumactl${GEM_BIN_SUFFIX}
+${GEM_LIB}/cache/${DISTNAME}.gem
+${GEM_LIB}/gems/${DISTNAME}/
+${GEM_LIB}/gems/${DISTNAME}/COPYING
+${GEM_LIB}/gems/${DISTNAME}/DEPLOYMENT.md
+${GEM_LIB}/gems/${DISTNAME}/Gemfile
+${GEM_LIB}/gems/${DISTNAME}/History.txt
+${GEM_LIB}/gems/${DISTNAME}/LICENSE
+${GEM_LIB}/gems/${DISTNAME}/Manifest.txt
+${GEM_LIB}/gems/${DISTNAME}/README.md
+${GEM_LIB}/gems/${DISTNAME}/Rakefile
+${GEM_LIB}/gems/${DISTNAME}/bin/
+${GEM_LIB}/gems/${DISTNAME}/bin/puma
+${GEM_LIB}/gems/${DISTNAME}/bin/puma-wild
+${GEM_LIB}/gems/${DISTNAME}/bin/pumactl
+${GEM_LIB}/gems/${DISTNAME}/docs/
+${GEM_LIB}/gems/${DISTNAME}/docs/config.md
+${GEM_LIB}/gems/${DISTNAME}/docs/nginx.md
+${GEM_LIB}/gems/${DISTNAME}/docs/signals.md
+${GEM_LIB}/gems/${DISTNAME}/lib/
+${GEM_LIB}/gems/${DISTNAME}/lib/puma/
+${GEM_LIB}/gems/${DISTNAME}/lib/puma.rb
+${GEM_LIB}/gems/${DISTNAME}/lib/puma/accept_nonblock.rb
+${GEM_LIB}/gems/${DISTNAME}/lib/puma/app/
+${GEM_LIB}/gems/${DISTNAME}/lib/puma/app/status.rb
+${GEM_LIB}/gems/${DISTNAME}/lib/puma/binder.rb
+${GEM_LIB}/gems/${DISTNAME}/lib/puma/capistrano.rb
+${GEM_LIB}/gems/${DISTNAME}/lib/puma/cli.rb
+${GEM_LIB}/gems/${DISTNAME}/lib/puma/client.rb
+${GEM_LIB}/gems/${DISTNAME}/lib/puma/cluster.rb
+${GEM_LIB}/gems/${DISTNAME}/lib/puma/commonlogger.rb
+${GEM_LIB}/gems/${DISTNAME}/lib/puma/compat.rb
+${GEM_LIB}/gems/${DISTNAME}/lib/puma/configuration.rb
+${GEM_LIB}/gems/${DISTNAME}/lib/puma/const.rb
+${GEM_LIB}/gems/${DISTNAME}/lib/puma/control_cli.rb
+${GEM_LIB}/gems/${DISTNAME}/lib/puma/daemon_ext.rb
+${GEM_LIB}/gems/${DISTNAME}/lib/puma/delegation.rb
+${GEM_LIB}/gems/${DISTNAME}/lib/puma/detect.rb
+${GEM_LIB}/gems/${DISTNAME}/lib/puma/dsl.rb
+${GEM_LIB}/gems/${DISTNAME}/lib/puma/events.rb
+${GEM_LIB}/gems/${DISTNAME}/lib/puma/io_buffer.rb
+${GEM_LIB}/gems/${DISTNAME}/lib/puma/java_io_buffer.rb
+${GEM_LIB}/gems/${DISTNAME}/lib/puma/jruby_restart.rb
+${GEM_LIB}/gems/${DISTNAME}/lib/puma/minissl.rb
+${GEM_LIB}/gems/${DISTNAME}/lib/puma/null_io.rb
+${GEM_LIB}/gems/${DISTNAME}/lib/puma/puma_http11.so
+${GEM_LIB}/gems/${DISTNAME}/lib/puma/rack/
+${GEM_LIB}/gems/${DISTNAME}/lib/puma/rack/backports/
+${GEM_LIB}/gems/${DISTNAME}/lib/puma/rack/backports/uri/
+${GEM_LIB}/gems/${DISTNAME}/lib/puma/rack/backports/uri/common_18.rb
+${GEM_LIB}/gems/${DISTNAME}/lib/puma/rack/backports/uri/common_192.rb
+${GEM_LIB}/gems/${DISTNAME}/lib/puma/rack/backports/uri/common_193.rb
+${GEM_LIB}/gems/${DISTNAME}/lib/puma/rack/builder.rb
+${GEM_LIB}/gems/${DISTNAME}/lib/puma/rack_default.rb
+${GEM_LIB}/gems/${DISTNAME}/lib/puma/reactor.rb
+${GEM_LIB}/gems/${DISTNAME}/lib/puma/runner.rb
+${GEM_LIB}/gems/${DISTNAME}/lib/puma/server.rb
+${GEM_LIB}/gems/${DISTNAME}/lib/puma/single.rb
+${GEM_LIB}/gems/${DISTNAME}/lib/puma/tcp_logger.rb
+${GEM_LIB}/gems/${DISTNAME}/lib/puma/thread_pool.rb
+${GEM_LIB}/gems/${DISTNAME}/lib/puma/util.rb
+${GEM_LIB}/gems/${DISTNAME}/lib/rack/
+${GEM_LIB}/gems/${DISTNAME}/lib/rack/handler/
+${GEM_LIB}/gems/${DISTNAME}/lib/rack/handler/puma.rb
+${GEM_LIB}/gems/${DISTNAME}/puma.gemspec
+${GEM_LIB}/gems/${DISTNAME}/tools/
+${GEM_LIB}/gems/${DISTNAME}/tools/jungle/
+${GEM_LIB}/gems/${DISTNAME}/tools/jungle/README.md
+${GEM_LIB}/gems/${DISTNAME}/tools/jungle/init.d/
+${GEM_LIB}/gems/${DISTNAME}/tools/jungle/init.d/README.md
+${GEM_LIB}/gems/${DISTNAME}/tools/jungle/init.d/puma
+${GEM_LIB}/gems/${DISTNAME}/tools/jungle/init.d/run-puma
+${GEM_LIB}/gems/${DISTNAME}/tools/jungle/upstart/
+${GEM_LIB}/gems/${DISTNAME}/tools/jungle/upstart/README.md
+${GEM_LIB}/gems/${DISTNAME}/tools/jungle/upstart/puma-manager.conf
+${GEM_LIB}/gems/${DISTNAME}/tools/jungle/upstart/puma.conf
+${GEM_LIB}/gems/${DISTNAME}/tools/trickletest.rb
+${GEM_LIB}/specifications/${DISTNAME}.gemspec