diff --git a/www/ruby-passenger/Makefile b/www/ruby-passenger/Makefile
index da267e16cf8..a6ab3a546e8 100644
--- a/www/ruby-passenger/Makefile
+++ b/www/ruby-passenger/Makefile
@@ -1,10 +1,10 @@
-# $OpenBSD: Makefile,v 1.1.1.1 2009/08/20 20:36:12 bernd Exp $
+# $OpenBSD: Makefile,v 1.2 2009/09/01 17:45:43 bernd Exp $
 
 SHARED_ONLY =	Yes
 
 COMMENT =	Nginx module for deploying Ruby applications
 
-DISTNAME =	passenger-2.2.4
+DISTNAME =	passenger-2.2.5
 PKGNAME =	ruby-${DISTNAME}
 CATEGORIES =	www
 
diff --git a/www/ruby-passenger/distinfo b/www/ruby-passenger/distinfo
index 8e569d3483e..121bce48a4a 100644
--- a/www/ruby-passenger/distinfo
+++ b/www/ruby-passenger/distinfo
@@ -1,5 +1,5 @@
-MD5 (passenger-2.2.4.tar.gz) = hzzciraZmcbmrQIomrMPuQ==
-RMD160 (passenger-2.2.4.tar.gz) = xE7pQbUIa6TBuEaig4HqKbLBtzI=
-SHA1 (passenger-2.2.4.tar.gz) = 54h541wwq0ZB81ZVFGuUru7lE7o=
-SHA256 (passenger-2.2.4.tar.gz) = E0hs9O8l6nbQYh3cyy0w3DgNfBZhhJuGSfJaevX6mvo=
-SIZE (passenger-2.2.4.tar.gz) = 1789131
+MD5 (passenger-2.2.5.tar.gz) = k4OLhCzgoMZdfG75zlnEHw==
+RMD160 (passenger-2.2.5.tar.gz) = qYFtaWrZQIaFJfbPsC6QA9af+1Q=
+SHA1 (passenger-2.2.5.tar.gz) = qm5F+gI9Ys4vX3jvujov90LQB6w=
+SHA256 (passenger-2.2.5.tar.gz) = sJCBfoQMe34NOcXuopLIfUKLHlbynvSheHBdtCyewyY=
+SIZE (passenger-2.2.5.tar.gz) = 1799698
diff --git a/www/ruby-passenger/patches/patch-Rakefile b/www/ruby-passenger/patches/patch-Rakefile
index 1a863b11c52..0ef5c7ed992 100644
--- a/www/ruby-passenger/patches/patch-Rakefile
+++ b/www/ruby-passenger/patches/patch-Rakefile
@@ -1,6 +1,6 @@
-$OpenBSD: patch-Rakefile,v 1.1.1.1 2009/08/20 20:36:12 bernd Exp $
---- Rakefile.orig	Wed Jun 10 10:12:29 2009
-+++ Rakefile	Thu Aug 20 21:13:25 2009
+$OpenBSD: patch-Rakefile,v 1.2 2009/09/01 17:45:43 bernd Exp $
+--- Rakefile.orig	Tue Sep  1 10:51:22 2009
++++ Rakefile	Tue Sep  1 19:26:08 2009
 @@ -36,13 +36,13 @@ OPTIMIZE = ["yes", "on", "true"].include?(ENV['OPTIMIZ
  
  include PlatformInfo
@@ -19,8 +19,8 @@ $OpenBSD: patch-Rakefile,v 1.1.1.1 2009/08/20 20:36:12 bernd Exp $
  end
  
  # Extra compiler flags that should always be passed to the C/C++ compiler.
-@@ -739,7 +739,7 @@ task :clobber => :'package:clean'
- ##### Misc
+@@ -736,7 +736,7 @@ Rake::Task['package:force'].prerequisites.unshift(:doc
+ task :clobber => :'package:clean'
  
  desc "Create a fakeroot, useful for building native packages"
 -task :fakeroot => [:apache2, :native_support, :doc] do
@@ -28,7 +28,7 @@ $OpenBSD: patch-Rakefile,v 1.1.1.1 2009/08/20 20:36:12 bernd Exp $
  	require 'rbconfig'
  	include Config
  	fakeroot = "pkg/fakeroot"
-@@ -747,11 +747,11 @@ task :fakeroot => [:apache2, :native_support, :doc] do
+@@ -744,11 +744,11 @@ task :fakeroot => [:apache2, :native_support, :doc] do
  	# We don't use CONFIG['archdir'] and the like because we want
  	# the files to be installed to /usr, and the Ruby interpreter
  	# on the packaging machine might be in /usr/local.
@@ -44,7 +44,7 @@ $OpenBSD: patch-Rakefile,v 1.1.1.1 2009/08/20 20:36:12 bernd Exp $
  	
  	sh "rm -rf #{fakeroot}"
  	sh "mkdir -p #{fakeroot}"
-@@ -766,9 +766,9 @@ task :fakeroot => [:apache2, :native_support, :doc] do
+@@ -763,9 +763,9 @@ task :fakeroot => [:apache2, :native_support, :doc] do
  	sh "cp bin/* #{bindir}/"
  	
  	sh "mkdir -p #{libexecdir}"
diff --git a/www/ruby-passenger/patches/patch-lib_phusion_passenger_platform_info_rb b/www/ruby-passenger/patches/patch-lib_phusion_passenger_platform_info_rb
index 2f977d31fac..973fcfce412 100644
--- a/www/ruby-passenger/patches/patch-lib_phusion_passenger_platform_info_rb
+++ b/www/ruby-passenger/patches/patch-lib_phusion_passenger_platform_info_rb
@@ -1,7 +1,7 @@
-$OpenBSD: patch-lib_phusion_passenger_platform_info_rb,v 1.1.1.1 2009/08/20 20:36:12 bernd Exp $
---- lib/phusion_passenger/platform_info.rb.orig	Thu Apr 16 19:42:11 2009
-+++ lib/phusion_passenger/platform_info.rb	Thu Apr 16 21:20:04 2009
-@@ -360,6 +360,8 @@ public
+$OpenBSD: patch-lib_phusion_passenger_platform_info_rb,v 1.2 2009/09/01 17:45:43 bernd Exp $
+--- lib/phusion_passenger/platform_info.rb.orig	Mon Aug 31 15:39:27 2009
++++ lib/phusion_passenger/platform_info.rb	Tue Sep  1 19:26:08 2009
+@@ -361,6 +361,8 @@ public
  	def self.portability_ldflags
  		if RUBY_PLATFORM =~ /solaris/
  			return '-lxnet -lrt -lsocket -lnsl -lpthread'
diff --git a/www/ruby-passenger/patches/patch-lib_phusion_passenger_utils_rb b/www/ruby-passenger/patches/patch-lib_phusion_passenger_utils_rb
deleted file mode 100644
index 71c0e4b33b9..00000000000
--- a/www/ruby-passenger/patches/patch-lib_phusion_passenger_utils_rb
+++ /dev/null
@@ -1,12 +0,0 @@
-$OpenBSD: patch-lib_phusion_passenger_utils_rb,v 1.1.1.1 2009/08/20 20:36:12 bernd Exp $
---- lib/phusion_passenger/utils.rb.orig	Wed Jun 24 11:31:25 2009
-+++ lib/phusion_passenger/utils.rb	Wed Jun 24 11:32:01 2009
-@@ -560,7 +560,7 @@ end
- # Ruby's implementation of UNIXSocket#recv_io and UNIXSocket#send_io
- # are broken on 64-bit FreeBSD 7 and x86_64/ppc64 OS X. So we override them
- # with our own implementation.
--if RUBY_PLATFORM =~ /freebsd/ || (RUBY_PLATFORM =~ /darwin/ && RUBY_PLATFORM !~ /universal/)
-+if RUBY_PLATFORM =~ /freebsd/ || RUBY_PLATFORM =~ /openbsd/ || (RUBY_PLATFORM =~ /darwin/ && RUBY_PLATFORM !~ /universal/)
- 	require 'socket'
- 	UNIXSocket.class_eval do
- 		def recv_io
diff --git a/www/ruby-passenger/pkg/PLIST b/www/ruby-passenger/pkg/PLIST
index bce83f51839..76bf041ed40 100644
--- a/www/ruby-passenger/pkg/PLIST
+++ b/www/ruby-passenger/pkg/PLIST
@@ -1,4 +1,4 @@
-@comment $OpenBSD: PLIST,v 1.1.1.1 2009/08/20 20:36:13 bernd Exp $
+@comment $OpenBSD: PLIST,v 1.2 2009/09/01 17:45:43 bernd Exp $
 bin/passenger-config
 @comment bin/passenger-memory-stats
 bin/passenger-status
@@ -427,7 +427,9 @@ share/doc/phusion_passenger/rdoc/classes/PhusionPassenger/Railz/FrameworkSpawner
 share/doc/phusion_passenger/rdoc/classes/PhusionPassenger/Railz/RequestHandler.html
 share/doc/phusion_passenger/rdoc/classes/PhusionPassenger/SpawnManager.html
 share/doc/phusion_passenger/rdoc/classes/PhusionPassenger/UnknownError.html
+share/doc/phusion_passenger/rdoc/classes/PhusionPassenger/Utils/
 share/doc/phusion_passenger/rdoc/classes/PhusionPassenger/Utils.html
+share/doc/phusion_passenger/rdoc/classes/PhusionPassenger/Utils/PseudoIO.html
 share/doc/phusion_passenger/rdoc/classes/PhusionPassenger/VersionNotFound.html
 share/doc/phusion_passenger/rdoc/classes/PhusionPassenger/WSGI/
 share/doc/phusion_passenger/rdoc/classes/PhusionPassenger/WSGI.html