diff --git a/www/ruby-unicorn/Makefile b/www/ruby-unicorn/Makefile
index 182205a3454..1fd61a3e1e6 100644
--- a/www/ruby-unicorn/Makefile
+++ b/www/ruby-unicorn/Makefile
@@ -1,8 +1,8 @@
-# $OpenBSD: Makefile,v 1.4 2011/05/11 23:41:23 jeremy Exp $
+# $OpenBSD: Makefile,v 1.5 2011/07/06 01:18:27 jeremy Exp $
 
 COMMENT =	ruby-rack HTTP server for Unix and fast clients
 
-DISTNAME =	unicorn-3.6.2
+DISTNAME =	unicorn-4.0.1
 CATEGORIES =	www
 
 HOMEPAGE =	http://unicorn.bogomips.org/
@@ -18,8 +18,9 @@ PERMIT_DISTFILES_FTP = Yes
 MODULES =	lang/ruby
 
 BUILD_DEPENDS =	${RUN_DEPENDS}
-RUN_DEPENDS =	www/ruby-rack,${MODRUBY_FLAVOR} \
-		devel/ruby-kgio,${MODRUBY_FLAVOR}>=2.2,<3.0
+RUN_DEPENDS =	devel/ruby-kgio,${MODRUBY_FLAVOR}>=2.4,<3.0 \
+		www/ruby-rack,${MODRUBY_FLAVOR} \
+		www/ruby-raindrops,${MODRUBY_FLAVOR}>=0.6,<1.0
 
 CONFIGURE_STYLE = ruby gem ext
 
diff --git a/www/ruby-unicorn/distinfo b/www/ruby-unicorn/distinfo
index 5fd235d0888..4b90b541cb8 100644
--- a/www/ruby-unicorn/distinfo
+++ b/www/ruby-unicorn/distinfo
@@ -1,5 +1,5 @@
-MD5 (unicorn-3.6.2.gem) = 3rD/5JtKQHXTJvN5a5Gvfg==
-RMD160 (unicorn-3.6.2.gem) = K2t/BhIotdaXaZYr60XaZIeJIfM=
-SHA1 (unicorn-3.6.2.gem) = jGkGjpJb4BagDksJzgze6+fKHM8=
-SHA256 (unicorn-3.6.2.gem) = ZBCBjGBgZ7Dl01qFiwEz2ATw9u47UyCXuDd3gdzCUSk=
-SIZE (unicorn-3.6.2.gem) = 229888
+MD5 (unicorn-4.0.1.gem) = Kp0lMVL/xFvUTOostf3Vig==
+RMD160 (unicorn-4.0.1.gem) = 5nVbIJlWIQgA1U+Qj65Dmd0NHO4=
+SHA1 (unicorn-4.0.1.gem) = O44KA+D52Q1hZ+D4zA3H/NCWxVQ=
+SHA256 (unicorn-4.0.1.gem) = JytWFVpSWkjGgUGwDvMJOtZ1hYd+4itx/znluxGCEWQ=
+SIZE (unicorn-4.0.1.gem) = 242176
diff --git a/www/ruby-unicorn/pkg/PLIST b/www/ruby-unicorn/pkg/PLIST
index 2179fa8288f..d6fb83644c2 100644
--- a/www/ruby-unicorn/pkg/PLIST
+++ b/www/ruby-unicorn/pkg/PLIST
@@ -1,4 +1,4 @@
-@comment $OpenBSD: PLIST,v 1.3 2011/05/11 23:41:23 jeremy Exp $
+@comment $OpenBSD: PLIST,v 1.4 2011/07/06 01:18:27 jeremy Exp $
 ${GEM_BIN}/unicorn${GEM_BIN_SUFFIX}
 ${GEM_BIN}/unicorn_rails${GEM_BIN_SUFFIX}
 ${GEM_LIB}/cache/${DISTNAME}.gem
@@ -27,6 +27,7 @@ ${GEM_LIB}/gems/${DISTNAME}/ISSUES
 ${GEM_LIB}/gems/${DISTNAME}/KNOWN_ISSUES
 ${GEM_LIB}/gems/${DISTNAME}/LATEST
 ${GEM_LIB}/gems/${DISTNAME}/LICENSE
+${GEM_LIB}/gems/${DISTNAME}/Links
 ${GEM_LIB}/gems/${DISTNAME}/NEWS
 ${GEM_LIB}/gems/${DISTNAME}/PHILOSOPHY
 ${GEM_LIB}/gems/${DISTNAME}/README
@@ -103,7 +104,9 @@ ${GEM_LIB}/gems/${DISTNAME}/t/bin/content-md5-put
 ${GEM_LIB}/gems/${DISTNAME}/t/bin/sha1sum.rb
 ${GEM_LIB}/gems/${DISTNAME}/t/bin/unused_listen
 ${GEM_LIB}/gems/${DISTNAME}/t/bin/utee
+${GEM_LIB}/gems/${DISTNAME}/t/broken-app.ru
 ${GEM_LIB}/gems/${DISTNAME}/t/env.ru
+${GEM_LIB}/gems/${DISTNAME}/t/heartbeat-timeout.ru
 ${GEM_LIB}/gems/${DISTNAME}/t/my-tap-lib.sh
 ${GEM_LIB}/gems/${DISTNAME}/t/oob_gc.ru
 ${GEM_LIB}/gems/${DISTNAME}/t/oob_gc_path.ru
@@ -166,12 +169,14 @@ ${GEM_LIB}/gems/${DISTNAME}/t/t0001-reload-bad-config.sh
 ${GEM_LIB}/gems/${DISTNAME}/t/t0002-config-conflict.sh
 ${GEM_LIB}/gems/${DISTNAME}/t/t0002-parser-error.sh
 ${GEM_LIB}/gems/${DISTNAME}/t/t0003-working_directory.sh
+${GEM_LIB}/gems/${DISTNAME}/t/t0004-heartbeat-timeout.sh
 ${GEM_LIB}/gems/${DISTNAME}/t/t0004-working_directory_broken.sh
 ${GEM_LIB}/gems/${DISTNAME}/t/t0005-working_directory_app.rb.sh
 ${GEM_LIB}/gems/${DISTNAME}/t/t0006-reopen-logs.sh
 ${GEM_LIB}/gems/${DISTNAME}/t/t0006.ru
 ${GEM_LIB}/gems/${DISTNAME}/t/t0007-working_directory_no_embed_cli.sh
 ${GEM_LIB}/gems/${DISTNAME}/t/t0008-back_out_of_upgrade.sh
+${GEM_LIB}/gems/${DISTNAME}/t/t0009-broken-app.sh
 ${GEM_LIB}/gems/${DISTNAME}/t/t0009-winch_ttin.sh
 ${GEM_LIB}/gems/${DISTNAME}/t/t0010-reap-logging.sh
 ${GEM_LIB}/gems/${DISTNAME}/t/t0011-active-unix-socket.sh
@@ -184,6 +189,8 @@ ${GEM_LIB}/gems/${DISTNAME}/t/t0015-configurator-internals.sh
 ${GEM_LIB}/gems/${DISTNAME}/t/t0016-trust-x-forwarded-false.sh
 ${GEM_LIB}/gems/${DISTNAME}/t/t0017-trust-x-forwarded-true.sh
 ${GEM_LIB}/gems/${DISTNAME}/t/t0018-write-on-close.sh
+${GEM_LIB}/gems/${DISTNAME}/t/t0019-max_header_len.sh
+${GEM_LIB}/gems/${DISTNAME}/t/t0020-at_exit-handler.sh
 ${GEM_LIB}/gems/${DISTNAME}/t/t0100-rack-input-tests.sh
 ${GEM_LIB}/gems/${DISTNAME}/t/t0116-client_body_buffer_size.sh
 ${GEM_LIB}/gems/${DISTNAME}/t/t0116.ru
@@ -203,6 +210,7 @@ ${GEM_LIB}/gems/${DISTNAME}/test/aggregate.rb
 ${GEM_LIB}/gems/${DISTNAME}/test/benchmark/
 ${GEM_LIB}/gems/${DISTNAME}/test/benchmark/README
 ${GEM_LIB}/gems/${DISTNAME}/test/benchmark/dd.ru
+${GEM_LIB}/gems/${DISTNAME}/test/benchmark/stack.ru
 ${GEM_LIB}/gems/${DISTNAME}/test/exec/
 ${GEM_LIB}/gems/${DISTNAME}/test/exec/README
 ${GEM_LIB}/gems/${DISTNAME}/test/exec/test_exec.rb
@@ -307,6 +315,7 @@ ${GEM_LIB}/gems/${DISTNAME}/test/rails/test_rails.rb
 ${GEM_LIB}/gems/${DISTNAME}/test/test_helper.rb
 ${GEM_LIB}/gems/${DISTNAME}/test/unit/
 ${GEM_LIB}/gems/${DISTNAME}/test/unit/test_configurator.rb
+${GEM_LIB}/gems/${DISTNAME}/test/unit/test_droplet.rb
 ${GEM_LIB}/gems/${DISTNAME}/test/unit/test_http_parser.rb
 ${GEM_LIB}/gems/${DISTNAME}/test/unit/test_http_parser_ng.rb
 ${GEM_LIB}/gems/${DISTNAME}/test/unit/test_http_parser_xftrust.rb