diff --git a/ap2-passenger/Makefile b/ap2-passenger/Makefile
index 235be53503..ce297157f6 100644
--- a/ap2-passenger/Makefile
+++ b/ap2-passenger/Makefile
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.4 2010/11/30 11:53:29 fhajny Exp $
+# $NetBSD: Makefile,v 1.5 2011/05/16 12:45:21 fhajny Exp $
 
-DISTNAME=		passenger-3.0.0
+DISTNAME=		passenger-3.0.7
 PKGNAME=		${APACHE_PKG_PREFIX}-${DISTNAME}
 CATEGORIES=		www
 
-MASTER_SITES=		http://rubyforge.org/frs/download.php/72923/
+MASTER_SITES=		http://rubyforge.org/frs/download.php/74656/
 MAINTAINER=		filip@joyent.com
 HOMEPAGE=		http://www.modrails.com/
 COMMENT=		Apache module for easy and robust deployment of Rails applications
@@ -42,9 +42,11 @@ REPLACE_FILES.ruby+=	bin/passenger-install-nginx-module
 REPLACE_FILES.ruby+=	bin/passenger-make-enterprisey
 REPLACE_FILES.ruby+=	bin/passenger-memory-stats
 REPLACE_FILES.ruby+=	bin/passenger-status
-REPLACE_FILES.ruby+=	bin/passenger-stress-test
+REPLACE_FILES.ruby+=	helper-scripts/passenger-spawn-server
+REPLACE_FILES.ruby+=	helper-scripts/prespawn
 
-CHECK_INTERPRETER_SKIP=	share/phusion-passenger/source/*
+CHECK_INTERPRETER_SKIP+=	share/phusion-passenger/source/*
+CHECK_INTERPRETER_SKIP+=	lib/ruby/vendor_ruby/1.8/phusion_passenger/wsgi/request_handler.py
 
 SUBST_CLASSES+=		rake
 SUBST_STAGE.rake=	post-patch
diff --git a/ap2-passenger/PLIST b/ap2-passenger/PLIST
index 4e30346103..c11b102c46 100644
--- a/ap2-passenger/PLIST
+++ b/ap2-passenger/PLIST
@@ -1,9 +1,8 @@
-@comment $NetBSD: PLIST,v 1.4 2011/04/07 08:22:19 tonnerre Exp $
+@comment $NetBSD: PLIST,v 1.5 2011/05/16 12:45:21 fhajny Exp $
 bin/passenger
 bin/passenger-config
 bin/passenger-install-apache2-module
 bin/passenger-install-nginx-module
-bin/passenger-stress-test
 lib/httpd/mod_passenger.${RUBY_DLEXT}
 lib/phusion-passenger/agents/PassengerLoggingAgent
 lib/phusion-passenger/agents/PassengerWatchdog
@@ -164,9 +163,9 @@ share/doc/phusion-passenger/images/spawn_server_architecture.png
 share/doc/phusion-passenger/images/spawn_server_architecture.svg
 share/doc/phusion-passenger/images/typical_isolated_web_application.png
 share/doc/phusion-passenger/images/typical_isolated_web_application.svg
-share/phusion-passenger/certificates/union_station_gateway.crt
 share/phusion-passenger/helper-scripts/passenger-spawn-server
 share/phusion-passenger/helper-scripts/prespawn
+share/phusion-passenger/mime.types
 share/phusion-passenger/source/DEVELOPERS.TXT
 share/phusion-passenger/source/INSTALL
 share/phusion-passenger/source/LICENSE
@@ -181,7 +180,6 @@ share/phusion-passenger/source/bin/passenger-install-nginx-module
 share/phusion-passenger/source/bin/passenger-make-enterprisey
 share/phusion-passenger/source/bin/passenger-memory-stats
 share/phusion-passenger/source/bin/passenger-status
-share/phusion-passenger/source/bin/passenger-stress-test
 share/phusion-passenger/source/build/agents.rb
 share/phusion-passenger/source/build/apache2.rb
 share/phusion-passenger/source/build/basics.rb
@@ -199,13 +197,27 @@ share/phusion-passenger/source/build/packagetask.rb
 share/phusion-passenger/source/build/packaging.rb
 share/phusion-passenger/source/build/rake_extensions.rb
 share/phusion-passenger/source/build/rdoctask.rb
+share/phusion-passenger/source/build/rpm.rb
 share/phusion-passenger/source/build/ruby_extension.rb
 share/phusion-passenger/source/build/ruby_tests.rb
 share/phusion-passenger/source/build/test_basics.rb
+share/phusion-passenger/source/debian/README.Debian
+share/phusion-passenger/source/debian/changelog
 share/phusion-passenger/source/debian/compat
 share/phusion-passenger/source/debian/control
-share/phusion-passenger/source/debian/postinst
+share/phusion-passenger/source/debian/copyright
+share/phusion-passenger/source/debian/libapache2-mod-passenger.install
+share/phusion-passenger/source/debian/libapache2-mod-passenger.postinst
+share/phusion-passenger/source/debian/libapache2-mod-passenger.prerm
+share/phusion-passenger/source/debian/passenger-common.install
+share/phusion-passenger/source/debian/passenger.conf
+share/phusion-passenger/source/debian/passenger.load
 share/phusion-passenger/source/debian/prerm
+share/phusion-passenger/source/debian/rules
+share/phusion-passenger/source/debian/watch
+share/phusion-passenger/source/dev/copy_boost_headers.rb
+share/phusion-passenger/source/dev/find_owner_pipe_leaks.rb
+share/phusion-passenger/source/dev/render_error_pages.rb
 share/phusion-passenger/source/doc/ApplicationPool algorithm.txt
 share/phusion-passenger/source/doc/Architectural overview.html
 share/phusion-passenger/source/doc/Architectural overview.txt
@@ -218,85 +230,44 @@ share/phusion-passenger/source/doc/Users guide Nginx.html
 share/phusion-passenger/source/doc/Users guide Nginx.txt
 share/phusion-passenger/source/doc/Users guide Standalone.html
 share/phusion-passenger/source/doc/Users guide Standalone.txt
-share/phusion-passenger/source/doc/cxxapi/AbstractSpawnManager_8h-source.html
 share/phusion-passenger/source/doc/cxxapi/AbstractSpawnManager_8h_source.html
-share/phusion-passenger/source/doc/cxxapi/Account_8h-source.html
 share/phusion-passenger/source/doc/cxxapi/Account_8h_source.html
-share/phusion-passenger/source/doc/cxxapi/AccountsDatabase_8h-source.html
 share/phusion-passenger/source/doc/cxxapi/AccountsDatabase_8h_source.html
 share/phusion-passenger/source/doc/cxxapi/AgentBase_8h_source.html
-share/phusion-passenger/source/doc/cxxapi/AgentsStarter_8h-source.html
 share/phusion-passenger/source/doc/cxxapi/AgentsStarter_8h_source.html
-share/phusion-passenger/source/doc/cxxapi/BCrypt_8h-source.html
 share/phusion-passenger/source/doc/cxxapi/BCrypt_8h_source.html
-share/phusion-passenger/source/doc/cxxapi/BacktracesServer_8h-source.html
-share/phusion-passenger/source/doc/cxxapi/Base64_8h-source.html
-share/phusion-passenger/source/doc/cxxapi/Blowfish_8h-source.html
 share/phusion-passenger/source/doc/cxxapi/Blowfish_8h_source.html
-share/phusion-passenger/source/doc/cxxapi/Bucket_8h-source.html
 share/phusion-passenger/source/doc/cxxapi/Bucket_8h_source.html
-share/phusion-passenger/source/doc/cxxapi/CachedFileStat_8h-source.html
-share/phusion-passenger/source/doc/cxxapi/Configuration_8h-source.html
-share/phusion-passenger/source/doc/cxxapi/Configuration_8h_source.html
-share/phusion-passenger/source/doc/cxxapi/Constants_8h-source.html
 share/phusion-passenger/source/doc/cxxapi/Constants_8h_source.html
-share/phusion-passenger/source/doc/cxxapi/ContentHandler_8h-source.html
 share/phusion-passenger/source/doc/cxxapi/ContentHandler_8h_source.html
-share/phusion-passenger/source/doc/cxxapi/DirectoryMapper_8h-source.html
 share/phusion-passenger/source/doc/cxxapi/DirectoryMapper_8h_source.html
 share/phusion-passenger/source/doc/cxxapi/EventedClient_8h_source.html
 share/phusion-passenger/source/doc/cxxapi/EventedMessageServer_8h_source.html
-share/phusion-passenger/source/doc/cxxapi/EventedServer_8h-source.html
 share/phusion-passenger/source/doc/cxxapi/EventedServer_8h_source.html
-share/phusion-passenger/source/doc/cxxapi/Exceptions_8h-source.html
 share/phusion-passenger/source/doc/cxxapi/Exceptions_8h_source.html
-share/phusion-passenger/source/doc/cxxapi/FileChangeChecker_8h-source.html
-share/phusion-passenger/source/doc/cxxapi/FileDescriptor_8h-source.html
 share/phusion-passenger/source/doc/cxxapi/FileDescriptor_8h_source.html
-share/phusion-passenger/source/doc/cxxapi/Hooks_8h-source.html
 share/phusion-passenger/source/doc/cxxapi/Hooks_8h_source.html
-share/phusion-passenger/source/doc/cxxapi/HttpStatusExtractor_8h-source.html
 share/phusion-passenger/source/doc/cxxapi/HttpStatusExtractor_8h_source.html
-share/phusion-passenger/source/doc/cxxapi/LoggingServer_8h-source.html
-share/phusion-passenger/source/doc/cxxapi/Logging_8h-source.html
+share/phusion-passenger/source/doc/cxxapi/IniFile_8h_source.html
 share/phusion-passenger/source/doc/cxxapi/Logging_8h_source.html
-share/phusion-passenger/source/doc/cxxapi/MessageChannel_8h-source.html
 share/phusion-passenger/source/doc/cxxapi/MessageChannel_8h_source.html
-share/phusion-passenger/source/doc/cxxapi/MessageClient_8h-source.html
 share/phusion-passenger/source/doc/cxxapi/MessageClient_8h_source.html
-share/phusion-passenger/source/doc/cxxapi/MessageReadersWriters_8h-source.html
 share/phusion-passenger/source/doc/cxxapi/MessageReadersWriters_8h_source.html
-share/phusion-passenger/source/doc/cxxapi/MessageServer_8h-source.html
 share/phusion-passenger/source/doc/cxxapi/MessageServer_8h_source.html
-share/phusion-passenger/source/doc/cxxapi/PoolOptions_8h-source.html
 share/phusion-passenger/source/doc/cxxapi/PoolOptions_8h_source.html
-share/phusion-passenger/source/doc/cxxapi/Process_8h-source.html
 share/phusion-passenger/source/doc/cxxapi/Process_8h_source.html
-share/phusion-passenger/source/doc/cxxapi/RandomGenerator_8h-source.html
 share/phusion-passenger/source/doc/cxxapi/RandomGenerator_8h_source.html
-share/phusion-passenger/source/doc/cxxapi/ResourceLocator_8h-source.html
 share/phusion-passenger/source/doc/cxxapi/ResourceLocator_8h_source.html
-share/phusion-passenger/source/doc/cxxapi/ScgiRequestParser_8h-source.html
+share/phusion-passenger/source/doc/cxxapi/SafeLibev_8h_source.html
 share/phusion-passenger/source/doc/cxxapi/ScgiRequestParser_8h_source.html
-share/phusion-passenger/source/doc/cxxapi/ServerInstanceDir_8h-source.html
 share/phusion-passenger/source/doc/cxxapi/ServerInstanceDir_8h_source.html
-share/phusion-passenger/source/doc/cxxapi/Session_8h-source.html
 share/phusion-passenger/source/doc/cxxapi/Session_8h_source.html
-share/phusion-passenger/source/doc/cxxapi/SpawnManager_8h-source.html
 share/phusion-passenger/source/doc/cxxapi/SpawnManager_8h_source.html
-share/phusion-passenger/source/doc/cxxapi/StaticContentHandler_8h-source.html
 share/phusion-passenger/source/doc/cxxapi/StaticContentHandler_8h_source.html
-share/phusion-passenger/source/doc/cxxapi/StaticString_8h-source.html
 share/phusion-passenger/source/doc/cxxapi/StaticString_8h_source.html
-share/phusion-passenger/source/doc/cxxapi/StringListCreator_8h-source.html
 share/phusion-passenger/source/doc/cxxapi/StringListCreator_8h_source.html
-share/phusion-passenger/source/doc/cxxapi/SystemTime_8h-source.html
-share/phusion-passenger/source/doc/cxxapi/Timer_8h-source.html
-share/phusion-passenger/source/doc/cxxapi/Utils_8h-source.html
 share/phusion-passenger/source/doc/cxxapi/Utils_8h_source.html
-share/phusion-passenger/source/doc/cxxapi/Version_8h-source.html
 share/phusion-passenger/source/doc/cxxapi/annotated.html
-share/phusion-passenger/source/doc/cxxapi/apache2_2Configuration_8h-source.html
 share/phusion-passenger/source/doc/cxxapi/apache2_2Configuration_8h_source.html
 share/phusion-passenger/source/doc/cxxapi/classAgentWatcher-members.html
 share/phusion-passenger/source/doc/cxxapi/classAgentWatcher.html
@@ -313,13 +284,6 @@ share/phusion-passenger/source/doc/cxxapi/classPassenger_1_1ArgumentException-me
 share/phusion-passenger/source/doc/cxxapi/classPassenger_1_1ArgumentException.html
 share/phusion-passenger/source/doc/cxxapi/classPassenger_1_1ArrayMessage-members.html
 share/phusion-passenger/source/doc/cxxapi/classPassenger_1_1ArrayMessage.html
-share/phusion-passenger/source/doc/cxxapi/classPassenger_1_1ArrayReader-members.html
-share/phusion-passenger/source/doc/cxxapi/classPassenger_1_1ArrayReader.html
-share/phusion-passenger/source/doc/cxxapi/classPassenger_1_1BacktracesServer-members.html
-share/phusion-passenger/source/doc/cxxapi/classPassenger_1_1BacktracesServer.html
-share/phusion-passenger/source/doc/cxxapi/classPassenger_1_1BacktracesServer__inherit__graph.map
-share/phusion-passenger/source/doc/cxxapi/classPassenger_1_1BacktracesServer__inherit__graph.md5
-share/phusion-passenger/source/doc/cxxapi/classPassenger_1_1BacktracesServer__inherit__graph.png
 share/phusion-passenger/source/doc/cxxapi/classPassenger_1_1BufferedUpload-members.html
 share/phusion-passenger/source/doc/cxxapi/classPassenger_1_1BufferedUpload.html
 share/phusion-passenger/source/doc/cxxapi/classPassenger_1_1BusyException-members.html
@@ -347,10 +311,10 @@ share/phusion-passenger/source/doc/cxxapi/classPassenger_1_1EventedServer.html
 share/phusion-passenger/source/doc/cxxapi/classPassenger_1_1EventedServer__inherit__graph.map
 share/phusion-passenger/source/doc/cxxapi/classPassenger_1_1EventedServer__inherit__graph.md5
 share/phusion-passenger/source/doc/cxxapi/classPassenger_1_1EventedServer__inherit__graph.png
-share/phusion-passenger/source/doc/cxxapi/classPassenger_1_1FileChangeChecker-members.html
-share/phusion-passenger/source/doc/cxxapi/classPassenger_1_1FileChangeChecker.html
 share/phusion-passenger/source/doc/cxxapi/classPassenger_1_1FileDescriptor-members.html
 share/phusion-passenger/source/doc/cxxapi/classPassenger_1_1FileDescriptor.html
+share/phusion-passenger/source/doc/cxxapi/classPassenger_1_1FileDescriptorPair-members.html
+share/phusion-passenger/source/doc/cxxapi/classPassenger_1_1FileDescriptorPair.html
 share/phusion-passenger/source/doc/cxxapi/classPassenger_1_1FileNotFoundException-members.html
 share/phusion-passenger/source/doc/cxxapi/classPassenger_1_1FileNotFoundException.html
 share/phusion-passenger/source/doc/cxxapi/classPassenger_1_1FileNotFoundException__inherit__graph.map
@@ -368,8 +332,6 @@ share/phusion-passenger/source/doc/cxxapi/classPassenger_1_1IOException.html
 share/phusion-passenger/source/doc/cxxapi/classPassenger_1_1IOException__inherit__graph.map
 share/phusion-passenger/source/doc/cxxapi/classPassenger_1_1IOException__inherit__graph.md5
 share/phusion-passenger/source/doc/cxxapi/classPassenger_1_1IOException__inherit__graph.png
-share/phusion-passenger/source/doc/cxxapi/classPassenger_1_1MemZeroGuard-members.html
-share/phusion-passenger/source/doc/cxxapi/classPassenger_1_1MemZeroGuard.html
 share/phusion-passenger/source/doc/cxxapi/classPassenger_1_1MessageChannel-members.html
 share/phusion-passenger/source/doc/cxxapi/classPassenger_1_1MessageChannel.html
 share/phusion-passenger/source/doc/cxxapi/classPassenger_1_1MessageServer-members.html
@@ -386,19 +348,18 @@ share/phusion-passenger/source/doc/cxxapi/classPassenger_1_1MessageServer_1_1Com
 share/phusion-passenger/source/doc/cxxapi/classPassenger_1_1MessageServer_1_1CommonClientContext__inherit__graph.png
 share/phusion-passenger/source/doc/cxxapi/classPassenger_1_1MessageServer_1_1Handler-members.html
 share/phusion-passenger/source/doc/cxxapi/classPassenger_1_1MessageServer_1_1Handler.html
-share/phusion-passenger/source/doc/cxxapi/classPassenger_1_1MessageServer_1_1Handler__inherit__graph.map
-share/phusion-passenger/source/doc/cxxapi/classPassenger_1_1MessageServer_1_1Handler__inherit__graph.md5
-share/phusion-passenger/source/doc/cxxapi/classPassenger_1_1MessageServer_1_1Handler__inherit__graph.png
 share/phusion-passenger/source/doc/cxxapi/classPassenger_1_1Process-members.html
 share/phusion-passenger/source/doc/cxxapi/classPassenger_1_1Process.html
 share/phusion-passenger/source/doc/cxxapi/classPassenger_1_1RandomGenerator-members.html
 share/phusion-passenger/source/doc/cxxapi/classPassenger_1_1RandomGenerator.html
+share/phusion-passenger/source/doc/cxxapi/classPassenger_1_1ResourceLocator-members.html
+share/phusion-passenger/source/doc/cxxapi/classPassenger_1_1ResourceLocator.html
 share/phusion-passenger/source/doc/cxxapi/classPassenger_1_1RuntimeException-members.html
 share/phusion-passenger/source/doc/cxxapi/classPassenger_1_1RuntimeException.html
+share/phusion-passenger/source/doc/cxxapi/classPassenger_1_1SafeLibev-members.html
+share/phusion-passenger/source/doc/cxxapi/classPassenger_1_1SafeLibev.html
 share/phusion-passenger/source/doc/cxxapi/classPassenger_1_1ScalarMessage-members.html
 share/phusion-passenger/source/doc/cxxapi/classPassenger_1_1ScalarMessage.html
-share/phusion-passenger/source/doc/cxxapi/classPassenger_1_1ScalarReader-members.html
-share/phusion-passenger/source/doc/cxxapi/classPassenger_1_1ScalarReader.html
 share/phusion-passenger/source/doc/cxxapi/classPassenger_1_1ScgiRequestParser-members.html
 share/phusion-passenger/source/doc/cxxapi/classPassenger_1_1ScgiRequestParser.html
 share/phusion-passenger/source/doc/cxxapi/classPassenger_1_1SecurityException-members.html
@@ -422,13 +383,13 @@ share/phusion-passenger/source/doc/cxxapi/classPassenger_1_1StandardSession__inh
 share/phusion-passenger/source/doc/cxxapi/classPassenger_1_1StandardSession__inherit__graph.png
 share/phusion-passenger/source/doc/cxxapi/classPassenger_1_1StaticString-members.html
 share/phusion-passenger/source/doc/cxxapi/classPassenger_1_1StaticString.html
+share/phusion-passenger/source/doc/cxxapi/classPassenger_1_1SyntaxError-members.html
+share/phusion-passenger/source/doc/cxxapi/classPassenger_1_1SyntaxError.html
 share/phusion-passenger/source/doc/cxxapi/classPassenger_1_1SystemException-members.html
 share/phusion-passenger/source/doc/cxxapi/classPassenger_1_1SystemException.html
 share/phusion-passenger/source/doc/cxxapi/classPassenger_1_1SystemException__inherit__graph.map
 share/phusion-passenger/source/doc/cxxapi/classPassenger_1_1SystemException__inherit__graph.md5
 share/phusion-passenger/source/doc/cxxapi/classPassenger_1_1SystemException__inherit__graph.png
-share/phusion-passenger/source/doc/cxxapi/classPassenger_1_1SystemTime-members.html
-share/phusion-passenger/source/doc/cxxapi/classPassenger_1_1SystemTime.html
 share/phusion-passenger/source/doc/cxxapi/classPassenger_1_1TimeRetrievalException-members.html
 share/phusion-passenger/source/doc/cxxapi/classPassenger_1_1TimeRetrievalException.html
 share/phusion-passenger/source/doc/cxxapi/classPassenger_1_1TimeRetrievalException__inherit__graph.map
@@ -436,22 +397,15 @@ share/phusion-passenger/source/doc/cxxapi/classPassenger_1_1TimeRetrievalExcepti
 share/phusion-passenger/source/doc/cxxapi/classPassenger_1_1TimeRetrievalException__inherit__graph.png
 share/phusion-passenger/source/doc/cxxapi/classPassenger_1_1TimeoutException-members.html
 share/phusion-passenger/source/doc/cxxapi/classPassenger_1_1TimeoutException.html
-share/phusion-passenger/source/doc/cxxapi/classPassenger_1_1Timer-members.html
-share/phusion-passenger/source/doc/cxxapi/classPassenger_1_1Timer.html
 share/phusion-passenger/source/doc/cxxapi/classPassenger_1_1Uint16Message-members.html
 share/phusion-passenger/source/doc/cxxapi/classPassenger_1_1Uint16Message.html
-share/phusion-passenger/source/doc/cxxapi/classPassenger_1_1Uint16Reader-members.html
-share/phusion-passenger/source/doc/cxxapi/classPassenger_1_1Uint16Reader.html
 share/phusion-passenger/source/doc/cxxapi/classPassenger_1_1Uint32Message-members.html
 share/phusion-passenger/source/doc/cxxapi/classPassenger_1_1Uint32Message.html
-share/phusion-passenger/source/doc/cxxapi/classPassenger_1_1Uint32Reader-members.html
-share/phusion-passenger/source/doc/cxxapi/classPassenger_1_1Uint32Reader.html
 share/phusion-passenger/source/doc/cxxapi/classServer-members.html
 share/phusion-passenger/source/doc/cxxapi/classServer.html
 share/phusion-passenger/source/doc/cxxapi/classServerInstanceDirToucher-members.html
 share/phusion-passenger/source/doc/cxxapi/classServerInstanceDirToucher.html
 share/phusion-passenger/source/doc/cxxapi/classes.html
-share/phusion-passenger/source/doc/cxxapi/definitions_8h-source.html
 share/phusion-passenger/source/doc/cxxapi/definitions_8h_source.html
 share/phusion-passenger/source/doc/cxxapi/doxygen.css
 share/phusion-passenger/source/doc/cxxapi/doxygen.png
@@ -496,9 +450,6 @@ share/phusion-passenger/source/doc/cxxapi/functions_vars.html
 share/phusion-passenger/source/doc/cxxapi/graph_legend.dot
 share/phusion-passenger/source/doc/cxxapi/graph_legend.html
 share/phusion-passenger/source/doc/cxxapi/graph_legend.png
-share/phusion-passenger/source/doc/cxxapi/group__Configuration.html
-share/phusion-passenger/source/doc/cxxapi/group__Configuration.map
-share/phusion-passenger/source/doc/cxxapi/group__Configuration.png
 share/phusion-passenger/source/doc/cxxapi/group__Core.html
 share/phusion-passenger/source/doc/cxxapi/group__Core.map
 share/phusion-passenger/source/doc/cxxapi/group__Core.png
@@ -614,6 +565,12 @@ share/phusion-passenger/source/doc/cxxapi/inherit__graph__39.png
 share/phusion-passenger/source/doc/cxxapi/inherit__graph__4.map
 share/phusion-passenger/source/doc/cxxapi/inherit__graph__4.md5
 share/phusion-passenger/source/doc/cxxapi/inherit__graph__4.png
+share/phusion-passenger/source/doc/cxxapi/inherit__graph__40.map
+share/phusion-passenger/source/doc/cxxapi/inherit__graph__40.md5
+share/phusion-passenger/source/doc/cxxapi/inherit__graph__40.png
+share/phusion-passenger/source/doc/cxxapi/inherit__graph__41.map
+share/phusion-passenger/source/doc/cxxapi/inherit__graph__41.md5
+share/phusion-passenger/source/doc/cxxapi/inherit__graph__41.png
 share/phusion-passenger/source/doc/cxxapi/inherit__graph__5.map
 share/phusion-passenger/source/doc/cxxapi/inherit__graph__5.md5
 share/phusion-passenger/source/doc/cxxapi/inherit__graph__5.png
@@ -631,7 +588,6 @@ share/phusion-passenger/source/doc/cxxapi/inherit__graph__9.md5
 share/phusion-passenger/source/doc/cxxapi/inherit__graph__9.png
 share/phusion-passenger/source/doc/cxxapi/inherits.html
 share/phusion-passenger/source/doc/cxxapi/main.html
-share/phusion-passenger/source/doc/cxxapi/md5_8h-source.html
 share/phusion-passenger/source/doc/cxxapi/modules.html
 share/phusion-passenger/source/doc/cxxapi/namespacePassenger.html
 share/phusion-passenger/source/doc/cxxapi/namespacemembers.html
@@ -640,16 +596,8 @@ share/phusion-passenger/source/doc/cxxapi/namespacemembers_eval.html
 share/phusion-passenger/source/doc/cxxapi/namespacemembers_func.html
 share/phusion-passenger/source/doc/cxxapi/namespacemembers_type.html
 share/phusion-passenger/source/doc/cxxapi/namespaces.html
-share/phusion-passenger/source/doc/cxxapi/nginx_2Configuration_8h-source.html
 share/phusion-passenger/source/doc/cxxapi/nginx_2Configuration_8h_source.html
-share/phusion-passenger/source/doc/cxxapi/ngx__http__passenger__module_8h-source.html
 share/phusion-passenger/source/doc/cxxapi/ngx__http__passenger__module_8h_source.html
-share/phusion-passenger/source/doc/cxxapi/structPassenger_1_1AnythingToString-members.html
-share/phusion-passenger/source/doc/cxxapi/structPassenger_1_1AnythingToString.html
-share/phusion-passenger/source/doc/cxxapi/structPassenger_1_1AnythingToString_3_01vector_3_01StaticString_01_4_01_4-members.html
-share/phusion-passenger/source/doc/cxxapi/structPassenger_1_1AnythingToString_3_01vector_3_01StaticString_01_4_01_4.html
-share/phusion-passenger/source/doc/cxxapi/structPassenger_1_1AnythingToString_3_01vector_3_01string_01_4_01_4-members.html
-share/phusion-passenger/source/doc/cxxapi/structPassenger_1_1AnythingToString_3_01vector_3_01string_01_4_01_4.html
 share/phusion-passenger/source/doc/cxxapi/structPassenger_1_1MessageServer_1_1DisconnectEventBroadcastGuard-members.html
 share/phusion-passenger/source/doc/cxxapi/structPassenger_1_1MessageServer_1_1DisconnectEventBroadcastGuard.html
 share/phusion-passenger/source/doc/cxxapi/structPassenger_1_1PoolOptions-members.html
@@ -700,166 +648,6 @@ share/phusion-passenger/source/doc/images/spawn_server_architecture.png
 share/phusion-passenger/source/doc/images/spawn_server_architecture.svg
 share/phusion-passenger/source/doc/images/typical_isolated_web_application.png
 share/phusion-passenger/source/doc/images/typical_isolated_web_application.svg
-share/phusion-passenger/source/doc/rdoc/classes/ConditionVariable.html
-share/phusion-passenger/source/doc/rdoc/classes/Exception.html
-share/phusion-passenger/source/doc/rdoc/classes/GC.html
-share/phusion-passenger/source/doc/rdoc/classes/IO.html
-share/phusion-passenger/source/doc/rdoc/classes/PhusionPassenger.html
-share/phusion-passenger/source/doc/rdoc/classes/PhusionPassenger/AbstractInstaller.html
-share/phusion-passenger/source/doc/rdoc/classes/PhusionPassenger/AbstractRequestHandler.html
-share/phusion-passenger/source/doc/rdoc/classes/PhusionPassenger/AbstractServer.html
-share/phusion-passenger/source/doc/rdoc/classes/PhusionPassenger/AbstractServer/InvalidPassword.html
-share/phusion-passenger/source/doc/rdoc/classes/PhusionPassenger/AbstractServer/ServerAlreadyStarted.html
-share/phusion-passenger/source/doc/rdoc/classes/PhusionPassenger/AbstractServer/ServerError.html
-share/phusion-passenger/source/doc/rdoc/classes/PhusionPassenger/AbstractServer/ServerNotStarted.html
-share/phusion-passenger/source/doc/rdoc/classes/PhusionPassenger/AbstractServer/UnknownMessage.html
-share/phusion-passenger/source/doc/rdoc/classes/PhusionPassenger/AbstractServerCollection.html
-share/phusion-passenger/source/doc/rdoc/classes/PhusionPassenger/AdminTools.html
-share/phusion-passenger/source/doc/rdoc/classes/PhusionPassenger/AdminTools/MemoryStats.html
-share/phusion-passenger/source/doc/rdoc/classes/PhusionPassenger/AdminTools/MemoryStats/Process.html
-share/phusion-passenger/source/doc/rdoc/classes/PhusionPassenger/AdminTools/ServerInstance.html
-share/phusion-passenger/source/doc/rdoc/classes/PhusionPassenger/AdminTools/ServerInstance/CorruptedDirectoryError.html
-share/phusion-passenger/source/doc/rdoc/classes/PhusionPassenger/AdminTools/ServerInstance/GenerationsAbsentError.html
-share/phusion-passenger/source/doc/rdoc/classes/PhusionPassenger/AdminTools/ServerInstance/Group.html
-share/phusion-passenger/source/doc/rdoc/classes/PhusionPassenger/AdminTools/ServerInstance/Process.html
-share/phusion-passenger/source/doc/rdoc/classes/PhusionPassenger/AdminTools/ServerInstance/RoleDeniedError.html
-share/phusion-passenger/source/doc/rdoc/classes/PhusionPassenger/AdminTools/ServerInstance/StaleDirectoryError.html
-share/phusion-passenger/source/doc/rdoc/classes/PhusionPassenger/AdminTools/ServerInstance/Stats.html
-share/phusion-passenger/source/doc/rdoc/classes/PhusionPassenger/AdminTools/ServerInstance/UnsupportedGenerationStructureVersionError.html
-share/phusion-passenger/source/doc/rdoc/classes/PhusionPassenger/AnalyticsLogger.html
-share/phusion-passenger/source/doc/rdoc/classes/PhusionPassenger/AnalyticsLogger/Log.html
-share/phusion-passenger/source/doc/rdoc/classes/PhusionPassenger/AnalyticsLogger/SharedData.html
-share/phusion-passenger/source/doc/rdoc/classes/PhusionPassenger/AppInitError.html
-share/phusion-passenger/source/doc/rdoc/classes/PhusionPassenger/AppProcess.html
-share/phusion-passenger/source/doc/rdoc/classes/PhusionPassenger/ClassicRails.html
-share/phusion-passenger/source/doc/rdoc/classes/PhusionPassenger/ClassicRails/ApplicationSpawner.html
-share/phusion-passenger/source/doc/rdoc/classes/PhusionPassenger/ClassicRails/ApplicationSpawner/Error.html
-share/phusion-passenger/source/doc/rdoc/classes/PhusionPassenger/ClassicRails/CGIFixed.html
-share/phusion-passenger/source/doc/rdoc/classes/PhusionPassenger/ClassicRails/FrameworkSpawner.html
-share/phusion-passenger/source/doc/rdoc/classes/PhusionPassenger/ClassicRails/FrameworkSpawner/Error.html
-share/phusion-passenger/source/doc/rdoc/classes/PhusionPassenger/ClassicRails/RequestHandler.html
-share/phusion-passenger/source/doc/rdoc/classes/PhusionPassenger/ClassicRailsExtensions.html
-share/phusion-passenger/source/doc/rdoc/classes/PhusionPassenger/ClassicRailsExtensions/AnalyticsLogging.html
-share/phusion-passenger/source/doc/rdoc/classes/PhusionPassenger/ConsoleTextTemplate.html
-share/phusion-passenger/source/doc/rdoc/classes/PhusionPassenger/DebugLogging.html
-share/phusion-passenger/source/doc/rdoc/classes/PhusionPassenger/FrameworkInitError.html
-share/phusion-passenger/source/doc/rdoc/classes/PhusionPassenger/HTMLTemplate.html
-share/phusion-passenger/source/doc/rdoc/classes/PhusionPassenger/InitializationError.html
-share/phusion-passenger/source/doc/rdoc/classes/PhusionPassenger/InvalidPath.html
-share/phusion-passenger/source/doc/rdoc/classes/PhusionPassenger/MessageChannel.html
-share/phusion-passenger/source/doc/rdoc/classes/PhusionPassenger/MessageChannel/InvalidHashError.html
-share/phusion-passenger/source/doc/rdoc/classes/PhusionPassenger/MessageClient.html
-share/phusion-passenger/source/doc/rdoc/classes/PhusionPassenger/NativeSupportLoader.html
-share/phusion-passenger/source/doc/rdoc/classes/PhusionPassenger/Packaging.html
-share/phusion-passenger/source/doc/rdoc/classes/PhusionPassenger/PlatformInfo.html
-share/phusion-passenger/source/doc/rdoc/classes/PhusionPassenger/Plugin.html
-share/phusion-passenger/source/doc/rdoc/classes/PhusionPassenger/Rack.html
-share/phusion-passenger/source/doc/rdoc/classes/PhusionPassenger/Rack/ApplicationSpawner.html
-share/phusion-passenger/source/doc/rdoc/classes/PhusionPassenger/Rack/ApplicationSpawner/Error.html
-share/phusion-passenger/source/doc/rdoc/classes/PhusionPassenger/Rack/RequestHandler.html
-share/phusion-passenger/source/doc/rdoc/classes/PhusionPassenger/Rails3Extensions.html
-share/phusion-passenger/source/doc/rdoc/classes/PhusionPassenger/Rails3Extensions/AnalyticsLogging.html
-share/phusion-passenger/source/doc/rdoc/classes/PhusionPassenger/Rails3Extensions/AnalyticsLogging/ACExtension.html
-share/phusion-passenger/source/doc/rdoc/classes/PhusionPassenger/Rails3Extensions/AnalyticsLogging/ASBenchmarkableExtension.html
-share/phusion-passenger/source/doc/rdoc/classes/PhusionPassenger/Rails3Extensions/AnalyticsLogging/ExceptionLogger.html
-share/phusion-passenger/source/doc/rdoc/classes/PhusionPassenger/SpawnManager.html
-share/phusion-passenger/source/doc/rdoc/classes/PhusionPassenger/Standalone.html
-share/phusion-passenger/source/doc/rdoc/classes/PhusionPassenger/Standalone/AppFinder.html
-share/phusion-passenger/source/doc/rdoc/classes/PhusionPassenger/Standalone/Command.html
-share/phusion-passenger/source/doc/rdoc/classes/PhusionPassenger/Standalone/ConfigFile.html
-share/phusion-passenger/source/doc/rdoc/classes/PhusionPassenger/Standalone/ConfigFile/DisallowedContextError.html
-share/phusion-passenger/source/doc/rdoc/classes/PhusionPassenger/Standalone/HelpCommand.html
-share/phusion-passenger/source/doc/rdoc/classes/PhusionPassenger/Standalone/Main.html
-share/phusion-passenger/source/doc/rdoc/classes/PhusionPassenger/Standalone/PackageRuntimeCommand.html
-share/phusion-passenger/source/doc/rdoc/classes/PhusionPassenger/Standalone/RuntimeInstaller.html
-share/phusion-passenger/source/doc/rdoc/classes/PhusionPassenger/Standalone/StartCommand.html
-share/phusion-passenger/source/doc/rdoc/classes/PhusionPassenger/Standalone/StatusCommand.html
-share/phusion-passenger/source/doc/rdoc/classes/PhusionPassenger/Standalone/StopCommand.html
-share/phusion-passenger/source/doc/rdoc/classes/PhusionPassenger/Standalone/Utils.html
-share/phusion-passenger/source/doc/rdoc/classes/PhusionPassenger/Standalone/VersionCommand.html
-share/phusion-passenger/source/doc/rdoc/classes/PhusionPassenger/UnknownError.html
-share/phusion-passenger/source/doc/rdoc/classes/PhusionPassenger/Utils.html
-share/phusion-passenger/source/doc/rdoc/classes/PhusionPassenger/Utils/FileSystemWatcher.html
-share/phusion-passenger/source/doc/rdoc/classes/PhusionPassenger/Utils/FileSystemWatcher/DirInfo.html
-share/phusion-passenger/source/doc/rdoc/classes/PhusionPassenger/Utils/FileSystemWatcher/FileInfo.html
-share/phusion-passenger/source/doc/rdoc/classes/PhusionPassenger/Utils/HostsFileParser.html
-share/phusion-passenger/source/doc/rdoc/classes/PhusionPassenger/Utils/PseudoIO.html
-share/phusion-passenger/source/doc/rdoc/classes/PhusionPassenger/Utils/RewindableInput.html
-share/phusion-passenger/source/doc/rdoc/classes/PhusionPassenger/Utils/RewindableInput/Tempfile.html
-share/phusion-passenger/source/doc/rdoc/classes/PhusionPassenger/Utils/UnseekableSocket.html
-share/phusion-passenger/source/doc/rdoc/classes/PhusionPassenger/VersionNotFound.html
-share/phusion-passenger/source/doc/rdoc/classes/PhusionPassenger/WSGI.html
-share/phusion-passenger/source/doc/rdoc/classes/PhusionPassenger/WSGI/ApplicationSpawner.html
-share/phusion-passenger/source/doc/rdoc/classes/Process.html
-share/phusion-passenger/source/doc/rdoc/classes/Signal.html
-share/phusion-passenger/source/doc/rdoc/created.rid
-share/phusion-passenger/source/doc/rdoc/files/DEVELOPERS_TXT.html
-share/phusion-passenger/source/doc/rdoc/files/README.html
-share/phusion-passenger/source/doc/rdoc/files/lib/phusion_passenger/abstract_installer_rb.html
-share/phusion-passenger/source/doc/rdoc/files/lib/phusion_passenger/abstract_request_handler_rb.html
-share/phusion-passenger/source/doc/rdoc/files/lib/phusion_passenger/abstract_server_collection_rb.html
-share/phusion-passenger/source/doc/rdoc/files/lib/phusion_passenger/abstract_server_rb.html
-share/phusion-passenger/source/doc/rdoc/files/lib/phusion_passenger/admin_tools/memory_stats_rb.html
-share/phusion-passenger/source/doc/rdoc/files/lib/phusion_passenger/admin_tools/server_instance_rb.html
-share/phusion-passenger/source/doc/rdoc/files/lib/phusion_passenger/admin_tools_rb.html
-share/phusion-passenger/source/doc/rdoc/files/lib/phusion_passenger/analytics_logger_rb.html
-share/phusion-passenger/source/doc/rdoc/files/lib/phusion_passenger/app_process_rb.html
-share/phusion-passenger/source/doc/rdoc/files/lib/phusion_passenger/classic_rails/application_spawner_rb.html
-share/phusion-passenger/source/doc/rdoc/files/lib/phusion_passenger/classic_rails/cgi_fixed_rb.html
-share/phusion-passenger/source/doc/rdoc/files/lib/phusion_passenger/classic_rails/framework_spawner_rb.html
-share/phusion-passenger/source/doc/rdoc/files/lib/phusion_passenger/classic_rails/request_handler_rb.html
-share/phusion-passenger/source/doc/rdoc/files/lib/phusion_passenger/classic_rails_extensions/init_rb.html
-share/phusion-passenger/source/doc/rdoc/files/lib/phusion_passenger/console_text_template_rb.html
-share/phusion-passenger/source/doc/rdoc/files/lib/phusion_passenger/constants_rb.html
-share/phusion-passenger/source/doc/rdoc/files/lib/phusion_passenger/debug_logging_rb.html
-share/phusion-passenger/source/doc/rdoc/files/lib/phusion_passenger/dependencies_rb.html
-share/phusion-passenger/source/doc/rdoc/files/lib/phusion_passenger/exceptions_rb.html
-share/phusion-passenger/source/doc/rdoc/files/lib/phusion_passenger/html_template_rb.html
-share/phusion-passenger/source/doc/rdoc/files/lib/phusion_passenger/message_channel_rb.html
-share/phusion-passenger/source/doc/rdoc/files/lib/phusion_passenger/message_client_rb.html
-share/phusion-passenger/source/doc/rdoc/files/lib/phusion_passenger/native_support_rb.html
-share/phusion-passenger/source/doc/rdoc/files/lib/phusion_passenger/packaging_rb.html
-share/phusion-passenger/source/doc/rdoc/files/lib/phusion_passenger/platform_info/apache_rb.html
-share/phusion-passenger/source/doc/rdoc/files/lib/phusion_passenger/platform_info/binary_compatibility_rb.html
-share/phusion-passenger/source/doc/rdoc/files/lib/phusion_passenger/platform_info/compiler_rb.html
-share/phusion-passenger/source/doc/rdoc/files/lib/phusion_passenger/platform_info/curl_rb.html
-share/phusion-passenger/source/doc/rdoc/files/lib/phusion_passenger/platform_info/documentation_tools_rb.html
-share/phusion-passenger/source/doc/rdoc/files/lib/phusion_passenger/platform_info/linux_rb.html
-share/phusion-passenger/source/doc/rdoc/files/lib/phusion_passenger/platform_info/operating_system_rb.html
-share/phusion-passenger/source/doc/rdoc/files/lib/phusion_passenger/platform_info/ruby_rb.html
-share/phusion-passenger/source/doc/rdoc/files/lib/phusion_passenger/platform_info/zlib_rb.html
-share/phusion-passenger/source/doc/rdoc/files/lib/phusion_passenger/platform_info_rb.html
-share/phusion-passenger/source/doc/rdoc/files/lib/phusion_passenger/plugin_rb.html
-share/phusion-passenger/source/doc/rdoc/files/lib/phusion_passenger/public_api_rb.html
-share/phusion-passenger/source/doc/rdoc/files/lib/phusion_passenger/rack/application_spawner_rb.html
-share/phusion-passenger/source/doc/rdoc/files/lib/phusion_passenger/rack/request_handler_rb.html
-share/phusion-passenger/source/doc/rdoc/files/lib/phusion_passenger/rails3_extensions/init_rb.html
-share/phusion-passenger/source/doc/rdoc/files/lib/phusion_passenger/simple_benchmarking_rb.html
-share/phusion-passenger/source/doc/rdoc/files/lib/phusion_passenger/spawn_manager_rb.html
-share/phusion-passenger/source/doc/rdoc/files/lib/phusion_passenger/standalone/app_finder_rb.html
-share/phusion-passenger/source/doc/rdoc/files/lib/phusion_passenger/standalone/command_rb.html
-share/phusion-passenger/source/doc/rdoc/files/lib/phusion_passenger/standalone/config_file_rb.html
-share/phusion-passenger/source/doc/rdoc/files/lib/phusion_passenger/standalone/help_command_rb.html
-share/phusion-passenger/source/doc/rdoc/files/lib/phusion_passenger/standalone/main_rb.html
-share/phusion-passenger/source/doc/rdoc/files/lib/phusion_passenger/standalone/package_runtime_command_rb.html
-share/phusion-passenger/source/doc/rdoc/files/lib/phusion_passenger/standalone/runtime_installer_rb.html
-share/phusion-passenger/source/doc/rdoc/files/lib/phusion_passenger/standalone/start_command_rb.html
-share/phusion-passenger/source/doc/rdoc/files/lib/phusion_passenger/standalone/status_command_rb.html
-share/phusion-passenger/source/doc/rdoc/files/lib/phusion_passenger/standalone/stop_command_rb.html
-share/phusion-passenger/source/doc/rdoc/files/lib/phusion_passenger/standalone/utils_rb.html
-share/phusion-passenger/source/doc/rdoc/files/lib/phusion_passenger/standalone/version_command_rb.html
-share/phusion-passenger/source/doc/rdoc/files/lib/phusion_passenger/utils/file_system_watcher_rb.html
-share/phusion-passenger/source/doc/rdoc/files/lib/phusion_passenger/utils/hosts_file_parser_rb.html
-share/phusion-passenger/source/doc/rdoc/files/lib/phusion_passenger/utils/rewindable_input_rb.html
-share/phusion-passenger/source/doc/rdoc/files/lib/phusion_passenger/utils/tmpdir_rb.html
-share/phusion-passenger/source/doc/rdoc/files/lib/phusion_passenger/utils/unseekable_socket_rb.html
-share/phusion-passenger/source/doc/rdoc/files/lib/phusion_passenger/utils_rb.html
-share/phusion-passenger/source/doc/rdoc/files/lib/phusion_passenger/wsgi/application_spawner_rb.html
-share/phusion-passenger/source/doc/rdoc/fr_class_index.html
-share/phusion-passenger/source/doc/rdoc/fr_file_index.html
-share/phusion-passenger/source/doc/rdoc/fr_method_index.html
-share/phusion-passenger/source/doc/rdoc/index.html
-share/phusion-passenger/source/doc/rdoc/rdoc-style.css
 share/phusion-passenger/source/doc/template/horo.rb
 share/phusion-passenger/source/doc/users_guide_snippets/analysis_and_system_maintenance.txt
 share/phusion-passenger/source/doc/users_guide_snippets/appendix_a_about.txt
@@ -879,7 +667,6 @@ share/phusion-passenger/source/ext/apache2/DirectoryMapper.h
 share/phusion-passenger/source/ext/apache2/HelperAgent.cpp
 share/phusion-passenger/source/ext/apache2/Hooks.cpp
 share/phusion-passenger/source/ext/apache2/Hooks.h
-share/phusion-passenger/source/ext/apache2/LICENSE-CNRI.TXT
 share/phusion-passenger/source/ext/apache2/mod_passenger.c
 share/phusion-passenger/source/ext/boost/algorithm/string/case_conv.hpp
 share/phusion-passenger/source/ext/boost/algorithm/string/compare.hpp
@@ -918,6 +705,7 @@ share/phusion-passenger/source/ext/boost/bind/storage.hpp
 share/phusion-passenger/source/ext/boost/call_traits.hpp
 share/phusion-passenger/source/ext/boost/checked_delete.hpp
 share/phusion-passenger/source/ext/boost/concept/assert.hpp
+share/phusion-passenger/source/ext/boost/concept/detail/backward_compatibility.hpp
 share/phusion-passenger/source/ext/boost/concept/detail/concept_def.hpp
 share/phusion-passenger/source/ext/boost/concept/detail/concept_undef.hpp
 share/phusion-passenger/source/ext/boost/concept/detail/general.hpp
@@ -933,6 +721,7 @@ share/phusion-passenger/source/ext/boost/config/abi_prefix.hpp
 share/phusion-passenger/source/ext/boost/config/abi_suffix.hpp
 share/phusion-passenger/source/ext/boost/config/auto_link.hpp
 share/phusion-passenger/source/ext/boost/config/compiler/borland.hpp
+share/phusion-passenger/source/ext/boost/config/compiler/clang.hpp
 share/phusion-passenger/source/ext/boost/config/compiler/codegear.hpp
 share/phusion-passenger/source/ext/boost/config/compiler/comeau.hpp
 share/phusion-passenger/source/ext/boost/config/compiler/common_edg.hpp
@@ -946,9 +735,10 @@ share/phusion-passenger/source/ext/boost/config/compiler/intel.hpp
 share/phusion-passenger/source/ext/boost/config/compiler/kai.hpp
 share/phusion-passenger/source/ext/boost/config/compiler/metrowerks.hpp
 share/phusion-passenger/source/ext/boost/config/compiler/mpw.hpp
+share/phusion-passenger/source/ext/boost/config/compiler/nvcc.hpp
 share/phusion-passenger/source/ext/boost/config/compiler/pgi.hpp
 share/phusion-passenger/source/ext/boost/config/compiler/sgi_mipspro.hpp
-share/phusion-passenger/source/ext/boost/config/compiler/sunpro_cc.hpp
+share/phusion-passenger/source/ext/boost/config/compiler/${LOWER_VENDOR}pro_cc.hpp
 share/phusion-passenger/source/ext/boost/config/compiler/vacpp.hpp
 share/phusion-passenger/source/ext/boost/config/compiler/visualc.hpp
 share/phusion-passenger/source/ext/boost/config/no_tr1/cmath.hpp
@@ -966,7 +756,8 @@ share/phusion-passenger/source/ext/boost/config/platform/irix.hpp
 share/phusion-passenger/source/ext/boost/config/platform/linux.hpp
 share/phusion-passenger/source/ext/boost/config/platform/macos.hpp
 share/phusion-passenger/source/ext/boost/config/platform/qnxnto.hpp
-share/phusion-passenger/source/ext/boost/config/platform/solaris.hpp
+share/phusion-passenger/source/ext/boost/config/platform/${LOWER_OPSYS}.hpp
+share/phusion-passenger/source/ext/boost/config/platform/symbian.hpp
 share/phusion-passenger/source/ext/boost/config/platform/vxworks.hpp
 share/phusion-passenger/source/ext/boost/config/platform/win32.hpp
 share/phusion-passenger/source/ext/boost/config/posix_features.hpp
@@ -1119,12 +910,14 @@ share/phusion-passenger/source/ext/boost/iterator/detail/minimum_category.hpp
 share/phusion-passenger/source/ext/boost/iterator/interoperable.hpp
 share/phusion-passenger/source/ext/boost/iterator/iterator_adaptor.hpp
 share/phusion-passenger/source/ext/boost/iterator/iterator_categories.hpp
+share/phusion-passenger/source/ext/boost/iterator/iterator_concepts.hpp
 share/phusion-passenger/source/ext/boost/iterator/iterator_facade.hpp
 share/phusion-passenger/source/ext/boost/iterator/iterator_traits.hpp
 share/phusion-passenger/source/ext/boost/iterator/reverse_iterator.hpp
 share/phusion-passenger/source/ext/boost/iterator/transform_iterator.hpp
 share/phusion-passenger/source/ext/boost/lexical_cast.hpp
 share/phusion-passenger/source/ext/boost/limits.hpp
+share/phusion-passenger/source/ext/boost/make_shared.hpp
 share/phusion-passenger/source/ext/boost/mem_fn.hpp
 share/phusion-passenger/source/ext/boost/memory_order.hpp
 share/phusion-passenger/source/ext/boost/mpl/always.hpp
@@ -1294,6 +1087,7 @@ share/phusion-passenger/source/ext/boost/preprocessor/repetition/detail/for.hpp
 share/phusion-passenger/source/ext/boost/preprocessor/repetition/enum.hpp
 share/phusion-passenger/source/ext/boost/preprocessor/repetition/enum_binary_params.hpp
 share/phusion-passenger/source/ext/boost/preprocessor/repetition/enum_params.hpp
+share/phusion-passenger/source/ext/boost/preprocessor/repetition/enum_trailing_params.hpp
 share/phusion-passenger/source/ext/boost/preprocessor/repetition/for.hpp
 share/phusion-passenger/source/ext/boost/preprocessor/repetition/repeat.hpp
 share/phusion-passenger/source/ext/boost/preprocessor/repetition/repeat_from_to.hpp
@@ -1313,12 +1107,16 @@ share/phusion-passenger/source/ext/boost/preprocessor/tuple/eat.hpp
 share/phusion-passenger/source/ext/boost/preprocessor/tuple/elem.hpp
 share/phusion-passenger/source/ext/boost/preprocessor/tuple/rem.hpp
 share/phusion-passenger/source/ext/boost/preprocessor/tuple/to_list.hpp
+share/phusion-passenger/source/ext/boost/range/algorithm/equal.hpp
 share/phusion-passenger/source/ext/boost/range/as_literal.hpp
 share/phusion-passenger/source/ext/boost/range/begin.hpp
+share/phusion-passenger/source/ext/boost/range/concepts.hpp
 share/phusion-passenger/source/ext/boost/range/config.hpp
 share/phusion-passenger/source/ext/boost/range/const_iterator.hpp
 share/phusion-passenger/source/ext/boost/range/detail/common.hpp
+share/phusion-passenger/source/ext/boost/range/detail/extract_optional_type.hpp
 share/phusion-passenger/source/ext/boost/range/detail/implementation_help.hpp
+share/phusion-passenger/source/ext/boost/range/detail/misc_concept.hpp
 share/phusion-passenger/source/ext/boost/range/detail/sfinae.hpp
 share/phusion-passenger/source/ext/boost/range/detail/str_types.hpp
 share/phusion-passenger/source/ext/boost/range/difference_type.hpp
@@ -1328,6 +1126,8 @@ share/phusion-passenger/source/ext/boost/range/end.hpp
 share/phusion-passenger/source/ext/boost/range/functions.hpp
 share/phusion-passenger/source/ext/boost/range/iterator.hpp
 share/phusion-passenger/source/ext/boost/range/iterator_range.hpp
+share/phusion-passenger/source/ext/boost/range/iterator_range_core.hpp
+share/phusion-passenger/source/ext/boost/range/iterator_range_io.hpp
 share/phusion-passenger/source/ext/boost/range/mutable_iterator.hpp
 share/phusion-passenger/source/ext/boost/range/rbegin.hpp
 share/phusion-passenger/source/ext/boost/range/rend.hpp
@@ -1338,13 +1138,14 @@ share/phusion-passenger/source/ext/boost/range/value_type.hpp
 share/phusion-passenger/source/ext/boost/ref.hpp
 share/phusion-passenger/source/ext/boost/scoped_array.hpp
 share/phusion-passenger/source/ext/boost/scoped_ptr.hpp
+share/phusion-passenger/source/ext/boost/shared_array.hpp
 share/phusion-passenger/source/ext/boost/shared_ptr.hpp
 share/phusion-passenger/source/ext/boost/smart_ptr/bad_weak_ptr.hpp
 share/phusion-passenger/source/ext/boost/smart_ptr/detail/atomic_count.hpp
 share/phusion-passenger/source/ext/boost/smart_ptr/detail/atomic_count_gcc.hpp
 share/phusion-passenger/source/ext/boost/smart_ptr/detail/atomic_count_gcc_x86.hpp
 share/phusion-passenger/source/ext/boost/smart_ptr/detail/atomic_count_pthreads.hpp
-share/phusion-passenger/source/ext/boost/smart_ptr/detail/atomic_count_solaris.hpp
+share/phusion-passenger/source/ext/boost/smart_ptr/detail/atomic_count_${LOWER_OPSYS}.hpp
 share/phusion-passenger/source/ext/boost/smart_ptr/detail/atomic_count_sync.hpp
 share/phusion-passenger/source/ext/boost/smart_ptr/detail/atomic_count_win32.hpp
 share/phusion-passenger/source/ext/boost/smart_ptr/detail/operator_bool.hpp
@@ -1361,7 +1162,7 @@ share/phusion-passenger/source/ext/boost/smart_ptr/detail/sp_counted_base_gcc_sp
 share/phusion-passenger/source/ext/boost/smart_ptr/detail/sp_counted_base_gcc_x86.hpp
 share/phusion-passenger/source/ext/boost/smart_ptr/detail/sp_counted_base_nt.hpp
 share/phusion-passenger/source/ext/boost/smart_ptr/detail/sp_counted_base_pt.hpp
-share/phusion-passenger/source/ext/boost/smart_ptr/detail/sp_counted_base_solaris.hpp
+share/phusion-passenger/source/ext/boost/smart_ptr/detail/sp_counted_base_${LOWER_OPSYS}.hpp
 share/phusion-passenger/source/ext/boost/smart_ptr/detail/sp_counted_base_spin.hpp
 share/phusion-passenger/source/ext/boost/smart_ptr/detail/sp_counted_base_sync.hpp
 share/phusion-passenger/source/ext/boost/smart_ptr/detail/sp_counted_base_w32.hpp
@@ -1375,8 +1176,10 @@ share/phusion-passenger/source/ext/boost/smart_ptr/detail/spinlock_pt.hpp
 share/phusion-passenger/source/ext/boost/smart_ptr/detail/spinlock_sync.hpp
 share/phusion-passenger/source/ext/boost/smart_ptr/detail/yield_k.hpp
 share/phusion-passenger/source/ext/boost/smart_ptr/enable_shared_from_this.hpp
+share/phusion-passenger/source/ext/boost/smart_ptr/make_shared.hpp
 share/phusion-passenger/source/ext/boost/smart_ptr/scoped_array.hpp
 share/phusion-passenger/source/ext/boost/smart_ptr/scoped_ptr.hpp
+share/phusion-passenger/source/ext/boost/smart_ptr/shared_array.hpp
 share/phusion-passenger/source/ext/boost/smart_ptr/shared_ptr.hpp
 share/phusion-passenger/source/ext/boost/smart_ptr/weak_ptr.hpp
 share/phusion-passenger/source/ext/boost/src/pthread/once.cpp
@@ -1469,11 +1272,13 @@ share/phusion-passenger/source/ext/boost/type_traits/is_float.hpp
 share/phusion-passenger/source/ext/boost/type_traits/is_function.hpp
 share/phusion-passenger/source/ext/boost/type_traits/is_fundamental.hpp
 share/phusion-passenger/source/ext/boost/type_traits/is_integral.hpp
+share/phusion-passenger/source/ext/boost/type_traits/is_lvalue_reference.hpp
 share/phusion-passenger/source/ext/boost/type_traits/is_member_function_pointer.hpp
 share/phusion-passenger/source/ext/boost/type_traits/is_member_pointer.hpp
 share/phusion-passenger/source/ext/boost/type_traits/is_pod.hpp
 share/phusion-passenger/source/ext/boost/type_traits/is_pointer.hpp
 share/phusion-passenger/source/ext/boost/type_traits/is_reference.hpp
+share/phusion-passenger/source/ext/boost/type_traits/is_rvalue_reference.hpp
 share/phusion-passenger/source/ext/boost/type_traits/is_same.hpp
 share/phusion-passenger/source/ext/boost/type_traits/is_scalar.hpp
 share/phusion-passenger/source/ext/boost/type_traits/is_signed.hpp
@@ -1487,6 +1292,7 @@ share/phusion-passenger/source/ext/boost/type_traits/remove_cv.hpp
 share/phusion-passenger/source/ext/boost/type_traits/remove_pointer.hpp
 share/phusion-passenger/source/ext/boost/type_traits/remove_reference.hpp
 share/phusion-passenger/source/ext/boost/type_traits/type_with_alignment.hpp
+share/phusion-passenger/source/ext/boost/units/detail/utility.hpp
 share/phusion-passenger/source/ext/boost/utility.hpp
 share/phusion-passenger/source/ext/boost/utility/addressof.hpp
 share/phusion-passenger/source/ext/boost/utility/base_from_member.hpp
@@ -1519,10 +1325,12 @@ share/phusion-passenger/source/ext/common/EventedServer.h
 share/phusion-passenger/source/ext/common/Exceptions.h
 share/phusion-passenger/source/ext/common/FileDescriptor.h
 share/phusion-passenger/source/ext/common/HelperAgent/BacktracesServer.h
+share/phusion-passenger/source/ext/common/IniFile.h
 share/phusion-passenger/source/ext/common/Logging.cpp
 share/phusion-passenger/source/ext/common/Logging.h
-share/phusion-passenger/source/ext/common/LoggingAgent/ChangeNotifier.h
 share/phusion-passenger/source/ext/common/LoggingAgent/DataStoreId.h
+share/phusion-passenger/source/ext/common/LoggingAgent/FilterSupport.cpp
+share/phusion-passenger/source/ext/common/LoggingAgent/FilterSupport.h
 share/phusion-passenger/source/ext/common/LoggingAgent/LoggingServer.h
 share/phusion-passenger/source/ext/common/LoggingAgent/Main.cpp
 share/phusion-passenger/source/ext/common/LoggingAgent/RemoteSender.h
@@ -1534,6 +1342,7 @@ share/phusion-passenger/source/ext/common/PoolOptions.h
 share/phusion-passenger/source/ext/common/Process.h
 share/phusion-passenger/source/ext/common/RandomGenerator.h
 share/phusion-passenger/source/ext/common/ResourceLocator.h
+share/phusion-passenger/source/ext/common/SafeLibev.h
 share/phusion-passenger/source/ext/common/ServerInstanceDir.h
 share/phusion-passenger/source/ext/common/Session.h
 share/phusion-passenger/source/ext/common/SpawnManager.h
@@ -1544,12 +1353,11 @@ share/phusion-passenger/source/ext/common/Utils.h
 share/phusion-passenger/source/ext/common/Utils/Base64.cpp
 share/phusion-passenger/source/ext/common/Utils/Base64.h
 share/phusion-passenger/source/ext/common/Utils/BlockingQueue.h
-share/phusion-passenger/source/ext/common/Utils/BlockingScalar.h
+share/phusion-passenger/source/ext/common/Utils/BufferedIO.h
 share/phusion-passenger/source/ext/common/Utils/CachedFileStat.cpp
 share/phusion-passenger/source/ext/common/Utils/CachedFileStat.h
 share/phusion-passenger/source/ext/common/Utils/CachedFileStat.hpp
 share/phusion-passenger/source/ext/common/Utils/FileChangeChecker.h
-share/phusion-passenger/source/ext/common/Utils/FileHandleGuard.h
 share/phusion-passenger/source/ext/common/Utils/IOUtils.cpp
 share/phusion-passenger/source/ext/common/Utils/IOUtils.h
 share/phusion-passenger/source/ext/common/Utils/MD5.cpp
@@ -1559,11 +1367,18 @@ share/phusion-passenger/source/ext/common/Utils/ProcessMetricsCollector.h
 share/phusion-passenger/source/ext/common/Utils/ScopeGuard.h
 share/phusion-passenger/source/ext/common/Utils/StrIntUtils.cpp
 share/phusion-passenger/source/ext/common/Utils/StrIntUtils.h
+share/phusion-passenger/source/ext/common/Utils/StringMap.h
 share/phusion-passenger/source/ext/common/Utils/SystemTime.cpp
 share/phusion-passenger/source/ext/common/Utils/SystemTime.h
 share/phusion-passenger/source/ext/common/Utils/Timer.h
 share/phusion-passenger/source/ext/common/Utils/VariantMap.h
+share/phusion-passenger/source/ext/common/Utils/utf8.h
+share/phusion-passenger/source/ext/common/Utils/utf8/checked.h
+share/phusion-passenger/source/ext/common/Utils/utf8/core.h
+share/phusion-passenger/source/ext/common/Utils/utf8/unchecked.h
 share/phusion-passenger/source/ext/common/Watchdog.cpp
+share/phusion-passenger/source/ext/common/libboost_oxt/aggregate.cpp
+share/phusion-passenger/source/ext/common/libpassenger_common/aggregate.cpp
 share/phusion-passenger/source/ext/google/COPYING
 share/phusion-passenger/source/ext/google/ChangeLog
 share/phusion-passenger/source/ext/google/dense_hash_map
@@ -1749,21 +1564,21 @@ share/phusion-passenger/source/man/passenger-make-enterprisey.8
 share/phusion-passenger/source/man/passenger-memory-stats.8
 share/phusion-passenger/source/man/passenger-status.8
 share/phusion-passenger/source/man/passenger-stress-test.1
-share/phusion-passenger/source/misc/copy_boost_headers.rb
-share/phusion-passenger/source/misc/find_owner_pipe_leaks.rb
-share/phusion-passenger/source/misc/render_error_pages.rb
-share/phusion-passenger/source/misc/union_station_gateway.crt
+share/phusion-passenger/source/resources/mime.types
+share/phusion-passenger/source/resources/union_station_gateway.crt
 share/phusion-passenger/source/test/config.yml.example
 share/phusion-passenger/source/test/cxx/ApplicationPool_PoolTest.cpp
 share/phusion-passenger/source/test/cxx/ApplicationPool_PoolTestCases.cpp
 share/phusion-passenger/source/test/cxx/ApplicationPool_ServerTest.cpp
 share/phusion-passenger/source/test/cxx/ApplicationPool_Server_PoolTest.cpp
 share/phusion-passenger/source/test/cxx/Base64Test.cpp
+share/phusion-passenger/source/test/cxx/BufferedIOTest.cpp
 share/phusion-passenger/source/test/cxx/CachedFileStatTest.cpp
 share/phusion-passenger/source/test/cxx/CxxTestMain.cpp
 share/phusion-passenger/source/test/cxx/EventedClientTest.cpp
 share/phusion-passenger/source/test/cxx/FileChangeCheckerTest.cpp
 share/phusion-passenger/source/test/cxx/FileDescriptorTest.cpp
+share/phusion-passenger/source/test/cxx/FilterSupportTest.cpp
 share/phusion-passenger/source/test/cxx/HttpStatusExtractorTest.cpp
 share/phusion-passenger/source/test/cxx/IOUtilsTest.cpp
 share/phusion-passenger/source/test/cxx/LoggingTest.cpp
@@ -1771,10 +1586,12 @@ share/phusion-passenger/source/test/cxx/MessageChannelTest.cpp
 share/phusion-passenger/source/test/cxx/MessageReadersWritersTest.cpp
 share/phusion-passenger/source/test/cxx/MessageServerTest.cpp
 share/phusion-passenger/source/test/cxx/PoolOptionsTest.cpp
+share/phusion-passenger/source/test/cxx/ProcessMetricsCollectorTest.cpp
 share/phusion-passenger/source/test/cxx/ScgiRequestParserTest.cpp
 share/phusion-passenger/source/test/cxx/ServerInstanceDirTest.cpp
 share/phusion-passenger/source/test/cxx/SpawnManagerTest.cpp
 share/phusion-passenger/source/test/cxx/StaticStringTest.cpp
+share/phusion-passenger/source/test/cxx/StringMapTest.cpp
 share/phusion-passenger/source/test/cxx/SystemTimeTest.cpp
 share/phusion-passenger/source/test/cxx/TestSupport.cpp
 share/phusion-passenger/source/test/cxx/TestSupport.h
@@ -2080,6 +1897,7 @@ share/phusion-passenger/source/test/stub/rails_apps/2.3/mycook/tmp/pids/useless.
 share/phusion-passenger/source/test/stub/rails_apps/2.3/mycook/tmp/sessions/useless.txt
 share/phusion-passenger/source/test/stub/rails_apps/2.3/mycook/tmp/sockets/useless.txt
 share/phusion-passenger/source/test/stub/rails_apps/3.0/empty/Gemfile
+share/phusion-passenger/source/test/stub/rails_apps/3.0/empty/Gemfile.lock
 share/phusion-passenger/source/test/stub/rails_apps/3.0/empty/Rakefile
 share/phusion-passenger/source/test/stub/rails_apps/3.0/empty/app/controllers/application_controller.rb
 share/phusion-passenger/source/test/stub/rails_apps/3.0/empty/app/helpers/application_helper.rb
@@ -2132,6 +1950,7 @@ share/phusion-passenger/source/test/stub/wsgi/public/wsgi-snake.jpg
 share/phusion-passenger/source/test/stub/zsfa/header.png
 share/phusion-passenger/source/test/stub/zsfa/index.html
 share/phusion-passenger/source/test/stub/zsfa/zsfa.png
+share/phusion-passenger/source/test/support/allocate_memory.c
 share/phusion-passenger/source/test/support/apache2_controller.rb
 share/phusion-passenger/source/test/support/multipart.rb
 share/phusion-passenger/source/test/support/nginx_controller.rb
@@ -2139,3 +1958,4 @@ share/phusion-passenger/source/test/support/test_helper.rb
 share/phusion-passenger/source/test/support/valgrind.h
 share/phusion-passenger/source/test/tut/tut.h
 share/phusion-passenger/source/test/tut/tut_reporter.h
+share/phusion-passenger/union_station_gateway.crt
diff --git a/ap2-passenger/distinfo b/ap2-passenger/distinfo
index 9da00eebf0..bc506577d6 100644
--- a/ap2-passenger/distinfo
+++ b/ap2-passenger/distinfo
@@ -1,11 +1,11 @@
-$NetBSD: distinfo,v 1.6 2010/11/30 12:39:34 fhajny Exp $
+$NetBSD: distinfo,v 1.7 2011/05/16 12:45:21 fhajny Exp $
 
-SHA1 (passenger-3.0.0.tar.gz) = c076de4d739345fa705f35024f51af0f71f408f7
-RMD160 (passenger-3.0.0.tar.gz) = c379346b625d6e6938f8e81c31d7f7524972a878
-Size (passenger-3.0.0.tar.gz) = 3048705 bytes
-SHA1 (patch-aa) = b68a7435a5d71b3f1852e16761ab9ef355d659dd
+SHA1 (passenger-3.0.7.tar.gz) = f6fd2ff499af9b5ed637505bb3bbe3cc7675b989
+RMD160 (passenger-3.0.7.tar.gz) = 3a22895d72b3f6c9f953e00cb90fe0193494d058
+Size (passenger-3.0.7.tar.gz) = 2830376 bytes
+SHA1 (patch-aa) = f89c1738225b3db9cd3acc367c89f9c79f9d4684
 SHA1 (patch-ab) = 0d297d7c322900ed4e9f4e6dadacb0d3997c9d69
-SHA1 (patch-ac) = fba583b8827c3fdb866ea4b77de412e06e0201d1
+SHA1 (patch-ac) = fd87a14c30057bb7d13e8ef3389098b6d205ff41
 SHA1 (patch-ad) = c7fda683b859a8b66e0e6d17fcaf183e7fdab40c
 SHA1 (patch-ae) = 055978c055db764f32c9679858d4421a20794cef
-SHA1 (patch-af) = 8cce8fefdf9d2b4dd88bad9dad06b66844cede51
+SHA1 (patch-af) = 370c87d6d71aa999f221c2e2738444554772d026
diff --git a/ap2-passenger/patches/patch-aa b/ap2-passenger/patches/patch-aa
index 56db7fb171..e9405ce210 100644
--- a/ap2-passenger/patches/patch-aa
+++ b/ap2-passenger/patches/patch-aa
@@ -1,13 +1,11 @@
-$NetBSD: patch-aa,v 1.3 2010/11/30 11:53:29 fhajny Exp $
+$NetBSD: patch-aa,v 1.4 2011/05/16 12:45:21 fhajny Exp $
 
-Add a new Rake task to install the package files under pkgsrc.
---- build/packaging.rb.orig	2010-10-10 18:52:03.000000000 +0000
+--- build/packaging.rb.orig	2011-04-11 10:22:53.000000000 +0000
 +++ build/packaging.rb
-@@ -183,4 +183,78 @@ task 'package:debian' => :fakeroot do
- 	sh "sed -i 's/: any/: #{arch}/' #{fakeroot}/DEBIAN/control"
- 	sh "chown -R root:root #{fakeroot}"
- 	sh "dpkg -b #{fakeroot} pkg/passenger_#{VERSION_STRING}-#{arch}.deb"
-+end
+@@ -191,3 +191,77 @@ task 'package:debian' => 'package:check'
+ 	
+ 	sh "debuild"
+ end
 +
 +desc "Install into pkgsrc world (DESTDIR compatible)"
 +task :pkgsrc => [:apache2, :nginx] + Packaging::ASCII_DOCS do
@@ -17,8 +15,8 @@ Add a new Rake task to install the package files under pkgsrc.
 +        destdir = ENV['DESTDIR'].nil? ? '' : ENV['DESTDIR']
 +        prefix = ENV['PREFIX']
 +        
-+        fake_libdir = "#{destdir}#{prefix}/@RUBY_VENDORLIB@"
-+        fake_native_support_dir = "#{destdir}#{prefix}/@RUBY_VENDORARCHLIB@"
++        fake_libdir = "#{destdir}#{prefix}/lib/ruby/vendor_ruby/1.8"
++        fake_native_support_dir = "#{destdir}#{prefix}/lib/ruby/vendor_ruby/1.8/i386-solaris2"
 +        fake_agents_dir = "#{destdir}#{NATIVELY_PACKAGED_AGENTS_DIR}"
 +        fake_helper_scripts_dir = "#{destdir}#{NATIVELY_PACKAGED_HELPER_SCRIPTS_DIR}"
 +        fake_docdir = "#{destdir}#{NATIVELY_PACKAGED_DOCDIR}"
@@ -27,7 +25,7 @@ Add a new Rake task to install the package files under pkgsrc.
 +        fake_source_root = "#{destdir}#{NATIVELY_PACKAGED_SOURCE_ROOT}"
 +        fake_apache2_module = "#{destdir}#{NATIVELY_PACKAGED_APACHE2_MODULE}"
 +        fake_apache2_module_dir = File.dirname(fake_apache2_module)
-+        fake_certificates_dir = "#{destdir}#{prefix}/share/phusion-passenger/certificates"
++        fake_resources_dir = "#{destdir}#{prefix}/share/phusion-passenger"
 +        
 +        sh "rm -rf #{destdir}"
 +        sh "mkdir -p #{destdir}"
@@ -68,8 +66,8 @@ Add a new Rake task to install the package files under pkgsrc.
 +        sh "mkdir -p #{fake_apache2_module_dir}"
 +        sh "cp #{APACHE2_MODULE} #{fake_apache2_module_dir}/"
 +        
-+        sh "mkdir -p #{fake_certificates_dir}"
-+        sh "cp misc/*.crt #{fake_certificates_dir}/"
++        sh "mkdir -p #{fake_resources_dir}"
++        sh "cp resources/* #{fake_resources_dir}/"
 +        
 +        sh "mkdir -p #{fake_source_root}"
 +        spec.files.each do |filename|
@@ -81,5 +79,4 @@ Add a new Rake task to install the package files under pkgsrc.
 +                puts "cp '#{filename}' '#{fake_source_root}/#{dirname}/'"
 +                FileUtils.cp(filename, "#{fake_source_root}/#{dirname}/")
 +        end
- end
-\ No newline at end of file
++end
diff --git a/ap2-passenger/patches/patch-ac b/ap2-passenger/patches/patch-ac
index dbaede880a..6b59f2fda7 100644
--- a/ap2-passenger/patches/patch-ac
+++ b/ap2-passenger/patches/patch-ac
@@ -1,41 +1,24 @@
-$NetBSD: patch-ac,v 1.1 2010/11/30 11:53:29 fhajny Exp $
+$NetBSD: patch-ac,v 1.2 2011/05/16 12:45:21 fhajny Exp $
 
-Fix paths.
---- ext/common/ResourceLocator.h.orig	2010-10-10 18:52:03.000000000 +0000
+--- ext/common/ResourceLocator.h.orig	2011-02-17 15:05:08.000000000 +0000
 +++ ext/common/ResourceLocator.h
-@@ -44,7 +44,7 @@ public:
- 	
- 	string getSourceRoot() const {
- 		if (nativelyPackaged) {
--			return "/usr/lib/phusion-passenger/source";
-+			return "@PREFIX@/lib/phusion-passenger/source";
- 		} else {
- 			return root;
- 		}
-@@ -52,7 +52,7 @@ public:
- 	
- 	string getAgentsDir() const {
- 		if (nativelyPackaged) {
--			return "/usr/lib/phusion-passenger/agents";
-+			return "@PREFIX@/lib/phusion-passenger/agents";
- 		} else {
- 			return root + "/agents";
- 		}
-@@ -60,7 +60,7 @@ public:
- 	
- 	string getHelperScriptsDir() const {
- 		if (nativelyPackaged) {
--			return "/usr/share/phusion-passenger/helper-scripts";
-+			return "@PREFIX@/share/phusion-passenger/helper-scripts";
- 		} else {
- 			return root + "/helper-scripts";
- 		}
-@@ -72,7 +72,7 @@ public:
- 	
- 	string getCertificatesDir() const {
- 		if (nativelyPackaged) {
--			return "/usr/share/phusion-passenger/certificates";
-+			return "@PREFIX@/share/phusion-passenger/certificates";
- 		} else {
- 			return root + "/misc";
- 		}
+@@ -65,13 +65,13 @@ public:
+ 				!fileExists(root + "/DEVELOPERS.TXT");
+ 			
+ 			if (nativelyPackaged) {
+-				agentsDir           = "/usr/lib/phusion-passenger/agents";
+-				helperScriptsDir    = "/usr/share/phusion-passenger/helper-scripts";
+-				resourcesDir        = "/usr/share/phusion-passenger";
+-				docDir              = "/usr/share/doc/phusion-passenger";
++				agentsDir           = "@PREFIX@/lib/phusion-passenger/agents";
++				helperScriptsDir    = "@PREFIX@/share/phusion-passenger/helper-scripts";
++				resourcesDir        = "@PREFIX@/share/phusion-passenger";
++				docDir              = "@PREFIX@/share/doc/phusion-passenger";
+ 				rubyLibDir          = "";
+-				compilableSourceDir = "/usr/share/phusion-passenger/compilable-source";
+-				apache2Module       = "/usr/lib/apache2/modules/mod_passenger.so";
++				compilableSourceDir = "@PREFIX@/share/phusion-passenger/compilable-source";
++				apache2Module       = "@PREFIX@/lib/httpd/mod_passenger.so";
+ 			} else {
+ 				agentsDir           = root + "/agents";
+ 				helperScriptsDir    = root + "/helper-scripts";
diff --git a/ap2-passenger/patches/patch-af b/ap2-passenger/patches/patch-af
index 04e1a9afc4..01dab68438 100644
--- a/ap2-passenger/patches/patch-af
+++ b/ap2-passenger/patches/patch-af
@@ -1,26 +1,27 @@
-$NetBSD: patch-af,v 1.1 2010/11/30 11:53:29 fhajny Exp $
+$NetBSD: patch-af,v 1.2 2011/05/16 12:45:21 fhajny Exp $
 
-Fix paths.
---- lib/phusion_passenger.rb.orig	2010-10-10 18:52:03.000000000 +0000
+--- lib/phusion_passenger.rb.orig	2011-04-14 06:14:17.000000000 +0000
 +++ lib/phusion_passenger.rb
-@@ -46,11 +46,11 @@ module PhusionPassenger
+@@ -46,12 +46,12 @@ module PhusionPassenger
  		return @natively_packaged
  	end
  	
 -	NATIVELY_PACKAGED_SOURCE_ROOT        = "/usr/share/phusion-passenger/source"
 -	NATIVELY_PACKAGED_DOCDIR             = "/usr/share/doc/phusion-passenger"
+-	NATIVELY_PACKAGED_RESOURCES_DIR      = "/usr/share/phusion-passenger"
 -	NATIVELY_PACKAGED_AGENTS_DIR         = "/usr/lib/phusion-passenger/agents"
 -	NATIVELY_PACKAGED_HELPER_SCRIPTS_DIR = "/usr/share/phusion-passenger/helper-scripts"
 -	NATIVELY_PACKAGED_APACHE2_MODULE     = "/usr/lib/apache2/modules/mod_passenger.so"
 +	NATIVELY_PACKAGED_SOURCE_ROOT        = "@PREFIX@/share/phusion-passenger/source"
 +	NATIVELY_PACKAGED_DOCDIR             = "@PREFIX@/share/doc/phusion-passenger"
++	NATIVELY_PACKAGED_RESOURCES_DIR      = "@PREFIX@/share/phusion-passenger"
 +	NATIVELY_PACKAGED_AGENTS_DIR         = "@PREFIX@/lib/phusion-passenger/agents"
 +	NATIVELY_PACKAGED_HELPER_SCRIPTS_DIR = "@PREFIX@/share/phusion-passenger/helper-scripts"
 +	NATIVELY_PACKAGED_APACHE2_MODULE     = "@PREFIX@/lib/httpd/mod_passenger.so"
  	
  	# Directory containing the Phusion Passenger Ruby libraries.
  	LIBDIR         = File.expand_path(File.dirname(__FILE__))
-@@ -62,15 +62,14 @@ module PhusionPassenger
+@@ -63,15 +63,14 @@ module PhusionPassenger
  	LOCAL_DIR      = ".passenger"
  	
  	# Directories in which to look for plugins.