diff --git a/README.passenger.md b/README.passenger.md
index 1cc21202b..4b4caa8c0 100644
--- a/README.passenger.md
+++ b/README.passenger.md
@@ -1,115 +1,258 @@
 # Passenger
 
-Just enabling the Passenger module is insufficient for the use of Passenger in production. Passenger should be tunable to better fit the environment in which it is run while being aware of the resources it required.
+Just enabling the Passenger module is insufficient for the use of Passenger in
+production. Passenger should be tunable to better fit the environment in which
+it is run while being aware of the resources it required.
 
-To this end the Apache passenger module has been modified to apply system wide Passenger tuning declarations to `passenger.conf`. Declarations specific to a virtual host should be passed through when defining a `vhost` (e.g. `rack_base_uris` parameter on the `apache::vhost` class, check `README.md`).
+To this end the Apache passenger module has been modified to apply system wide
+Passenger tuning declarations to `passenger.conf`. Declarations specific to a
+virtual host should be passed through when defining a `vhost` (e.g.
+`rack_base_uris` parameter on the `apache::vhost` type, check `README.md`).
 
-Also, general apache module loading parameters can be supplied to enable using a customized passenger module in place of a default-package-based version of the module.
+Also, general apache module loading parameters can be supplied to enable using
+a customized passenger module in place of a default-package-based version of
+the module.
+
+# Operating system support and Passenger versions
+
+The most important configuration directive for the Apache Passenger module is
+`PassengerRoot`. Its value depends on the Passenger version used (2.x, 3.x or
+4.x) and on the operating system package from which the Apache Passenger module
+is installed.
+
+The following table summarises the current *default versions* and
+`PassengerRoot` settings for the operating systems supported by
+puppetlabs-apache:
+
+OS               | Passenger version  | `PassengerRoot` 
+---------------- | ------------------ | ----------------
+Debian 7         | 3.0.13             | /usr
+Ubuntu 12.04     | 2.2.11             | /usr
+Ubuntu 14.04     | 4.0.37             | /usr/lib/ruby/vendor_ruby/phusion_passenger/locations.ini 
+RHEL with EPEL6  | 3.0.21             | /usr/lib/ruby/gems/1.8/gems/passenger-3.0.21 
+
+As mentioned in `README.md` there are no compatible packages available for
+RHEL/CentOS 5 or RHEL/CentOS 7.
+
+## Configuration files and locations on RHEL/CentOS
+
+Notice two important points:
+
+1. The Passenger version packaged in the EPEL repositories may change over time.
+2. The value of `PassengerRoot` depends on the Passenger version installed.
+
+To prevent the puppetlabs-apache module from having to keep up with these
+package versions the Passenger configuration files installed by the
+packages are left untouched by this module. All configuration is placed in an
+extra configuration file managed by puppetlabs-apache.
+
+This means '/etc/httpd/conf.d/passenger.conf' is installed by the
+`mod_passenger` package and contains correct values for `PassengerRoot` and
+`PassengerRuby`. Puppet will ignore this file. Additional configuration
+directives as described in the remainder of this document are placed in
+'/etc/httpd/conf.d/passenger_extra.conf', managed by Puppet.
+
+This pertains *only* to RHEL/CentOS, *not* Debian and Ubuntu.
+
+## Third-party and custom Passenger packages and versions
+
+The Passenger version distributed by the default OS packages may be too old to
+be useful. Newer versions may be installed via Gems, from source or from
+third-party OS packages.
+
+Most notably the Passenger developers officially provide Debian packages for a
+variety of Debian and Ubuntu releases in the [Passenger APT
+repository](https://oss-binaries.phusionpassenger.com/apt/passenger). Read more
+about [installing these packages in the offical user
+guide](http://www.modrails.com/documentation/Users%20guide%20Apache.html#install_on_debian_ubuntu).
+
+If you install custom Passenger packages and newer version make sure to set the
+directives `PassengerRoot`, `PassengerRuby` and/or `PassengerDefaultRuby`
+correctly, or Passenger and Apache will fail to function properly.
+
+For Passenger 4.x packages on Debian and Ubuntu the `PassengerRoot` directive
+should almost universally be set to
+`/usr/lib/ruby/vendor_ruby/phusion_passenger/locations.ini`.
 
 # Parameters for `apache::mod::passenger`
 
-The following declarations are supported and can be passed to `apache::mod::passenger` as parameters, for example:
+The following class parameters configure Passenger in a global, server-wide
+context.
 
-```
-class {'apache::mod::passenger':
-  passenger_high_performance  => 'on',
-  rails_autodetect            => 'off',
-  mod_lib_path                => '/usr/lib/apache2/custom_modules',
+Example:
+
+```puppet
+class { 'apache::mod::passenger':
+  passenger_root             => '/usr/lib/ruby/vendor_ruby/phusion_passenger/locations.ini',
+  passenger_default_ruby     => '/usr/bin/ruby1.9.3',
+  passenger_high_performance => 'on',
+  rails_autodetect           => 'off',
+  mod_lib_path               => '/usr/lib/apache2/custom_modules',
 }
 ```
 
-The general form is using the all lower case version of the declaration.
+The general form is using the all lower-case version of the configuration
+directive, with underscores instead of CamelCase.
 
 ## Parameters used with passenger.conf
 
-If you pass a default value to `apache::mod::passenger` it will be ignored and not passed through to the configuration file. 
+If you pass a default value to `apache::mod::passenger` it will be ignored and
+not passed through to the configuration file. 
+
+### passenger_root
+
+The location to the Phusion Passenger root directory. This configuration option
+is essential to Phusion Passenger, and allows Phusion Passenger to locate its
+own data files. 
+
+The default depends on the Passenger version and the means of installation. See
+the above section on operating system support, versions and packages for more
+information.
+
+http://www.modrails.com/documentation/Users%20guide%20Apache.html#_passengerroot_lt_directory_gt
+
+### passenger_default_ruby
+
+This option specifies the default Ruby interpreter to use for web apps as well
+as for all sorts of internal Phusion Passenger helper scripts, e.g. the one
+used by PassengerPreStart.
+
+This directive was introduced in Passenger 4.0.0 and will not work in versions
+< 4.x. Do not set this parameter if your Passenger version is older than 4.0.0.
+
+Defaults to `undef` for all operating systems except Ubuntu 14.04, where it is
+set to '/usr/bin/ruby'.
+
+http://www.modrails.com/documentation/Users%20guide%20Apache.html#PassengerDefaultRuby
+
+### passenger_ruby
+
+This directive is the same as `passenger_default_ruby` for Passenger versions
+< 4.x and must be used instead of `passenger_default_ruby` for such versions.
+
+It makes no sense to set `PassengerRuby` for Passenger >= 4.x. That
+directive should only be used to override the value of `PassengerDefaultRuby`
+on a non-global context, i.e. in `<VirtualHost>`, `<Directory>`, `<Location>`
+and so on.
+
+Defaults to `/usr/bin/ruby` for all supported operating systems except Ubuntu
+14.04, where it is set to `undef`.
+
+http://www.modrails.com/documentation/Users%20guide%20Apache.html#PassengerRuby
 
 ### passenger_high_performance
 
-Default is `off`, when turned `on` Passenger runs in a higher performance mode that can be less compatible with other Apache modules.
+Default is `off`. When turned `on` Passenger runs in a higher performance mode
+that can be less compatible with other Apache modules.
 
 http://www.modrails.com/documentation/Users%20guide%20Apache.html#PassengerHighPerformance
 
 ### passenger_max_pool_size
 
-Set's the maximum number of Passenger application processes that may simultaneously run. The default value is 6.
+Sets the maximum number of Passenger application processes that may
+simultaneously run. The default value is 6.
 
 http://www.modrails.com/documentation/Users%20guide%20Apache.html#_passengermaxpoolsize_lt_integer_gt
 
 ### passenger_pool_idle_time
 
-The maximum number of seconds a Passenger Application process will be allowed to remain idle before being shut down. The default value is 300.
+The maximum number of seconds a Passenger Application process will be allowed
+to remain idle before being shut down. The default value is 300.
 
 http://www.modrails.com/documentation/Users%20guide%20Apache.html#PassengerPoolIdleTime
 
 ### passenger_max_requests
 
-The maximum number of request a Passenger application will process before being restarted. The default value is 0, which indicates that a process will only shut down if the Pool Idle Time (see above) expires.
+The maximum number of request a Passenger application will process before being
+restarted. The default value is 0, which indicates that a process will only
+shut down if the Pool Idle Time (see above) expires.
 
 http://www.modrails.com/documentation/Users%20guide%20Apache.html#PassengerMaxRequests
 
 ### passenger_stat_throttle_rate
 
-Sets how often Passenger performs file system checks, at most once every _x_ seconds. Default is 0, which means the checks are performed with every request.
+Sets how often Passenger performs file system checks, at most once every _x_
+seconds. Default is 0, which means the checks are performed with every request.
 
 http://www.modrails.com/documentation/Users%20guide%20Apache.html#_passengerstatthrottlerate_lt_integer_gt
 
 ### rack_autodetect
 
-Should Passenger automatically detect if the document root of a virtual host is a Rack application. The default is `on`
+Should Passenger automatically detect if the document root of a virtual host is
+a Rack application. Not set by default (`undef`). Note that this directive has
+been removed in Passenger 4.0.0 and `PassengerEnabled` should be used instead.
+Use this directive only on Passenger < 4.x.
 
 http://www.modrails.com/documentation/Users%20guide%20Apache.html#_rackautodetect_lt_on_off_gt
 
 ### rails_autodetect
 
-Should Passenger automatically detect if the document root of a virtual host is a Rails application. The default is on.
+Should Passenger automatically detect if the document root of a virtual host is
+a Rails application.  Not set by default (`undef`). Note that this directive
+has been removed in Passenger 4.0.0 and `PassengerEnabled` should be used
+instead. Use this directive only on Passenger < 4.x.
 
 http://www.modrails.com/documentation/Users%20guide%20Apache.html#_railsautodetect_lt_on_off_gt
 
 ### passenger_use_global_queue
 
-Allows toggling of PassengerUseGlobalQueue.  NOTE: PassengerUseGlobalQueue is the default in Passenger 4.x and the versions >= 4.x have disabled this configuration option altogether.  Use with caution.
+Allows toggling of PassengerUseGlobalQueue.  NOTE: PassengerUseGlobalQueue is
+the default in Passenger 4.x and the versions >= 4.x have disabled this
+configuration option altogether.  Use with caution.
 
 ## Parameters used to load the module
 
-Unlike the tuning parameters specified above, the following parameters are only used when loading customized passenger modules.
+Unlike the tuning parameters specified above, the following parameters are only
+used when loading customized passenger modules.
 
 ### mod_package
 
-Allows overriding the default package name used for the passenger module package.
+Allows overriding the default package name used for the passenger module
+package.
 
 ### mod_package_ensure
 
-Allows overriding the package installation setting used by puppet when installing the passenger module. The default is 'present'.
+Allows overriding the package installation setting used by puppet when
+installing the passenger module. The default is 'present'.
 
 ### mod_id
 
-Allows overriding the value used by apache to identify the passenger module. The default is 'passenger_module'.
+Allows overriding the value used by apache to identify the passenger module.
+The default is 'passenger_module'.
 
 ### mod_lib_path
 
-Allows overriding the directory path used by apache when loading the passenger module. The default is the value of `$apache::params::lib_path`.
+Allows overriding the directory path used by apache when loading the passenger
+module. The default is the value of `$apache::params::lib_path`.
 
 ### mod_lib
 
-Allows overriding the library file name used by apache when loading the passenger module. The default is 'mod_passenger.so'.
+Allows overriding the library file name used by apache when loading the
+passenger module. The default is 'mod_passenger.so'.
 
 ### mod_path
 
-Allows overriding the full path to the library file used by apache when loading the passenger module. The default is the concatenation of the `mod_lib_path` and `mod_lib` parameters.
+Allows overriding the full path to the library file used by apache when loading
+the passenger module. The default is the concatenation of the `mod_lib_path`
+and `mod_lib` parameters.
 
 # Dependencies
 
-RedHat-based systems will need to configure additional package repositories in order to install Passenger, specifically:
+RedHat-based systems will need to configure additional package repositories in
+order to install Passenger, specifically:
 
 * [Extra Packages for Enterprise Linux](https://fedoraproject.org/wiki/EPEL)
 * [Phusion Passenger](http://passenger.stealthymonkeys.com)
 
-Configuration of these repositories is beyond the scope of this module and is left to the user.
+Configuration of these repositories is beyond the scope of this module and is
+left to the user.
 
 # Attribution
 
-The Passenger tuning parameters for the `apache::mod::puppet` Puppet class was modified by Aaron Hicks (hicksa@landcareresearch.co.nz) for work on the NeSI Project and the Tuakiri New Zealand Access Federation as a fork from the PuppetLabs Apache module on GitHub.
+The Passenger tuning parameters for the `apache::mod::passenger` Puppet class
+was modified by Aaron Hicks (hicksa@landcareresearch.co.nz) for work on the
+NeSI Project and the Tuakiri New Zealand Access Federation as a fork from the
+PuppetLabs Apache module on GitHub.
 
 * https://github.com/puppetlabs/puppetlabs-apache
 * https://github.com/nesi/puppetlabs-apache
diff --git a/manifests/mod/passenger.pp b/manifests/mod/passenger.pp
index b39ae2634..12139cb2b 100644
--- a/manifests/mod/passenger.pp
+++ b/manifests/mod/passenger.pp
@@ -9,6 +9,7 @@
   $rails_autodetect               = undef,
   $passenger_root                 = $::apache::params::passenger_root,
   $passenger_ruby                 = $::apache::params::passenger_ruby,
+  $passenger_default_ruby         = $::apache::params::passenger_default_ruby,
   $passenger_max_pool_size        = undef,
   $passenger_use_global_queue     = undef,
   $mod_package                    = undef,
@@ -23,6 +24,20 @@
     file { 'passenger_package.conf':
       path => "${::apache::mod_dir}/${passenger_conf_package_file}",
     }
+  } else {
+    # Remove passenger_extra.conf left over from before Passenger support was
+    # reworked for Debian. This is a temporary fix for users running this
+    # module from master after release 1.0.1 It will be removed in two
+    # releases from now.
+    $passenger_package_conf_ensure = $::osfamily ? {
+      'Debian' => 'absent',
+      default  => undef,
+    }
+
+    file { 'passenger_package.conf':
+      ensure => $passenger_package_conf_ensure,
+      path   => "${::apache::mod_dir}/passenger_extra.conf",
+    }
   }
 
   $_package = $mod_package
@@ -52,6 +67,7 @@
   # Template uses:
   # - $passenger_root
   # - $passenger_ruby
+  # - $passenger_default_ruby
   # - $passenger_max_pool_size
   # - $passenger_high_performance
   # - $passenger_max_requests
diff --git a/manifests/params.pp b/manifests/params.pp
index c7a042a7d..f9e98623b 100644
--- a/manifests/params.pp
+++ b/manifests/params.pp
@@ -53,6 +53,7 @@
     $passenger_conf_package_file = 'passenger.conf'
     $passenger_root       = undef
     $passenger_ruby       = undef
+    $passenger_default_ruby = undef
     $suphp_addhandler     = 'php5-script'
     $suphp_engine         = 'off'
     $suphp_configpath     = undef
@@ -112,10 +113,6 @@
     $default_ssl_cert    = '/etc/ssl/certs/ssl-cert-snakeoil.pem'
     $default_ssl_key     = '/etc/ssl/private/ssl-cert-snakeoil.key'
     $ssl_certs_dir       = '/etc/ssl/certs'
-    $passenger_conf_file = 'passenger_extra.conf'
-    $passenger_conf_package_file = 'passenger.conf'
-    $passenger_root      = undef
-    $passenger_ruby      = undef
     $suphp_addhandler    = 'x-httpd-php'
     $suphp_engine        = 'off'
     $suphp_configpath    = '/etc/php5/apache2'
@@ -146,6 +143,53 @@
     $fastcgi_lib_path       = '/var/lib/apache2/fastcgi'
     $mime_support_package = 'mime-support'
     $mime_types_config    = '/etc/mime.types'
+
+    #
+    # Passenger-specific settings
+    #
+
+    $passenger_conf_file         = 'passenger.conf'
+    $passenger_conf_package_file = undef
+
+    case $::operatingsystem {
+      'Ubuntu': {
+        case $::lsbdistrelease {
+          '12.04': {
+            $passenger_root         = '/usr'
+            $passenger_ruby         = '/usr/bin/ruby'
+            $passenger_default_ruby = undef
+          }
+          '14.04': {
+            $passenger_root         = '/usr/lib/ruby/vendor_ruby/phusion_passenger/locations.ini'
+            $passenger_ruby         = undef
+            $passenger_default_ruby = '/usr/bin/ruby'
+          }
+          default: {
+            # The following settings may or may not work on Ubuntu releases not
+            # supported by this module.
+            $passenger_root         = '/usr'
+            $passenger_ruby         = '/usr/bin/ruby'
+            $passenger_default_ruby = undef
+          }
+        }
+      }
+      'Debian': {
+        case $::lsbdistcodename {
+          'wheezy': {
+            $passenger_root         = '/usr'
+            $passenger_ruby         = '/usr/bin/ruby'
+            $passenger_default_ruby = undef
+          }
+          default: {
+            # The following settings may or may not work on Debian releases not
+            # supported by this module.
+            $passenger_root         = '/usr'
+            $passenger_ruby         = '/usr/bin/ruby'
+            $passenger_default_ruby = undef
+          }
+        }
+      }
+    }
   } elsif $::osfamily == 'FreeBSD' {
     $user             = 'www'
     $group            = 'www'
@@ -173,6 +217,7 @@
     $passenger_conf_package_file = undef
     $passenger_root   = '/usr/local/lib/ruby/gems/1.9/gems/passenger-4.0.10'
     $passenger_ruby   = '/usr/bin/ruby'
+    $passenger_default_ruby = undef
     $suphp_addhandler = 'php5-script'
     $suphp_engine     = 'off'
     $suphp_configpath = undef
diff --git a/spec/acceptance/mod_passenger_spec.rb b/spec/acceptance/mod_passenger_spec.rb
index 68622eecb..fbfac1672 100644
--- a/spec/acceptance/mod_passenger_spec.rb
+++ b/spec/acceptance/mod_passenger_spec.rb
@@ -5,10 +5,39 @@
   when 'Debian'
     service_name = 'apache2'
     mod_dir = '/etc/apache2/mods-available/'
-    conf_file = "#{mod_dir}passenger_extra.conf"
+    conf_file = "#{mod_dir}passenger.conf"
     load_file = "#{mod_dir}passenger.load"
-    passenger_root = '/usr'
-    passenger_ruby = '/usr/bin/ruby'
+
+    case fact('operatingsystem')
+    when 'Ubuntu'
+      case fact('lsbdistrelease')
+      when '10.04'
+        passenger_root = '/usr'
+        passenger_ruby = '/usr/bin/ruby'
+      when '12.04'
+        passenger_root = '/usr'
+        passenger_ruby = '/usr/bin/ruby'
+      when '14.04'
+        passenger_root         = '/usr/lib/ruby/vendor_ruby/phusion_passenger/locations.ini'
+        passenger_ruby         = '/usr/bin/ruby'
+        passenger_default_ruby = '/usr/bin/ruby'
+      else
+        # This may or may not work on Ubuntu releases other than the above
+        passenger_root = '/usr'
+        passenger_ruby = '/usr/bin/ruby'
+      end
+    when 'Debian'
+      case fact('lsbdistcodename')
+      when 'wheezy'
+        passenger_root = '/usr'
+        passenger_ruby = '/usr/bin/ruby'
+      else
+        # This may or may not work on Debian releases other than the above
+        passenger_root = '/usr'
+        passenger_ruby = '/usr/bin/ruby'
+      end
+    end
+
     passenger_module_path = '/usr/lib/apache2/modules/mod_passenger.so'
     rackapp_user = 'www-data'
     rackapp_group = 'www-data'
@@ -71,9 +100,36 @@ class { 'apache::mod::passenger': }
       end
 
       describe file(conf_file) do
-        # passenger_extra.conf only contains directives if overridden from the class params
-        it { should_not contain "PassengerRoot \"#{passenger_root}\"" }
-        it { should_not contain "PassengerRuby \"#{passenger_ruby}\"" }
+        it { should contain "PassengerRoot \"#{passenger_root}\"" }
+
+        case fact('operatingsystem')
+        when 'Ubuntu'
+          case fact('lsbdistrelease')
+          when '10.04'
+            it { should contain "PassengerRuby \"#{passenger_ruby}\"" }
+            it { should_not contain "/PassengerDefaultRuby/" }
+          when '12.04'
+            it { should contain "PassengerRuby \"#{passenger_ruby}\"" }
+            it { should_not contain "/PassengerDefaultRuby/" }
+          when '14.04'
+            it { should contain "PassengerDefaultRuby \"#{passenger_ruby}\"" }
+            it { should_not contain "/PassengerRuby/" }
+          else
+            # This may or may not work on Ubuntu releases other than the above
+            it { should contain "PassengerRuby \"#{passenger_ruby}\"" }
+            it { should_not contain "/PassengerDefaultRuby/" }
+          end
+        when 'Debian'
+          case fact('lsbdistcodename')
+          when 'wheezy'
+            it { should contain "PassengerRuby \"#{passenger_ruby}\"" }
+            it { should_not contain "/PassengerDefaultRuby/" }
+          else
+            # This may or may not work on Debian releases other than the above
+            it { should contain "PassengerRuby \"#{passenger_ruby}\"" }
+            it { should_not contain "/PassengerDefaultRuby/" }
+          end
+        end
       end
 
       describe file(load_file) do
@@ -85,8 +141,13 @@ class { 'apache::mod::passenger': }
           r.stdout.should =~ /Apache processes/
           r.stdout.should =~ /Nginx processes/
           r.stdout.should =~ /Passenger processes/
-          r.stdout.should =~ /### Processes: [0-9]+/
-          r.stdout.should =~ /### Total private dirty RSS: [0-9\.]+ MB/
+
+          # passenger-memory-stats output on Ubuntu 14.04 does not contain
+          # these two lines
+          unless fact('operatingsystem') == 'Ubuntu' && fact('operatingsystemrelease') == '14.04'
+            r.stdout.should =~ /### Processes: [0-9]+/
+            r.stdout.should =~ /### Total private dirty RSS: [0-9\.]+ MB/
+          end
 
           r.exit_code.should == 0
         end
diff --git a/spec/classes/mod/passenger_spec.rb b/spec/classes/mod/passenger_spec.rb
index 608b3c47d..1821e0c71 100644
--- a/spec/classes/mod/passenger_spec.rb
+++ b/spec/classes/mod/passenger_spec.rb
@@ -16,16 +16,10 @@
     it { should contain_file('passenger.load').with({
       'path' => '/etc/apache2/mods-available/passenger.load',
     }) }
-    it { should contain_file('passenger_package.conf').with({
-      'path' => '/etc/apache2/mods-available/passenger.conf',
-    }) }
-    it { should contain_file('passenger_package.conf').without_content }
-    it { should contain_file('passenger_package.conf').without_source }
     it { should contain_file('passenger.conf').with({
-      'path' => '/etc/apache2/mods-available/passenger_extra.conf',
+      'path' => '/etc/apache2/mods-available/passenger.conf',
     }) }
-    it { should contain_file('passenger.conf').without_content(/PassengerRoot/) }
-    it { should contain_file('passenger.conf').without_content(/PassengerRuby/) }
+    it { should contain_file('passenger_package.conf').with_ensure('absent') }
     describe "with passenger_root => '/usr/lib/example'" do
       let :params do
         { :passenger_root => '/usr/lib/example' }
@@ -38,11 +32,17 @@
       end
       it { should contain_file('passenger.conf').with_content(%r{PassengerRuby "/usr/lib/example/ruby"}) }
     end
-    describe "with passenger_high_performance => true" do
+    describe "with passenger_default_ruby => /usr/lib/example/ruby1.9.3" do
+      let :params do
+        { :passenger_ruby => '/usr/lib/example/ruby1.9.3' }
+      end
+      it { should contain_file('passenger.conf').with_content(%r{PassengerRuby "/usr/lib/example/ruby1.9.3"}) }
+    end
+    describe "with passenger_high_performance => on" do
       let :params do
-        { :passenger_high_performance => 'true' }
+        { :passenger_high_performance => 'on' }
       end
-      it { should contain_file('passenger.conf').with_content(/^  PassengerHighPerformance true$/) }
+      it { should contain_file('passenger.conf').with_content(/^  PassengerHighPerformance on$/) }
     end
     describe "with passenger_pool_idle_time => 1200" do
       let :params do
@@ -68,35 +68,23 @@
       end
       it { should contain_file('passenger.conf').with_content(/^  PassengerMaxPoolSize 16$/) }
     end
-    describe "with rack_autodetect => true" do
+    describe "with rack_autodetect => on" do
       let :params do
-        { :rack_autodetect => true }
+        { :rack_autodetect => 'on' }
       end
-      it { should contain_file('passenger.conf').with_content(/^  RackAutoDetect true$/) }
+      it { should contain_file('passenger.conf').with_content(/^  RackAutoDetect on$/) }
     end
-    describe "with rails_autodetect => true" do
+    describe "with rails_autodetect => on" do
       let :params do
-        { :rails_autodetect => true }
+        { :rails_autodetect => 'on' }
       end
-      it { should contain_file('passenger.conf').with_content(/^  RailsAutoDetect true$/) }
+      it { should contain_file('passenger.conf').with_content(/^  RailsAutoDetect on$/) }
     end
-    describe "with passenger_root => '/usr/lib/example'" do
+    describe "with passenger_use_global_queue => on" do
       let :params do
-        { :passenger_root => '/usr/lib/example' }
+        { :passenger_use_global_queue => 'on' }
       end
-      it { should contain_file('passenger.conf').with_content(/^  PassengerRoot "\/usr\/lib\/example"$/) }
-    end
-    describe "with passenger_ruby => /usr/lib/example/ruby" do
-      let :params do
-        { :passenger_ruby => '/usr/lib/example/ruby' }
-      end
-      it { should contain_file('passenger.conf').with_content(/^  PassengerRuby "\/usr\/lib\/example\/ruby"$/) }
-    end
-    describe "with passenger_use_global_queue => true" do
-      let :params do
-        { :passenger_use_global_queue => 'true' }
-      end
-      it { should contain_file('passenger.conf').with_content(/^  PassengerUseGlobalQueue true$/) }
+      it { should contain_file('passenger.conf').with_content(/^  PassengerUseGlobalQueue on$/) }
     end
     describe "with mod_path => '/usr/lib/foo/mod_foo.so'" do
       let :params do
@@ -123,7 +111,55 @@
       it { should contain_file('passenger.load').with_content(/^LoadModule mod_foo \/usr\/lib\/apache2\/modules\/mod_passenger\.so$/) }
     end
 
+    context "with Ubuntu 12.04 defaults" do
+      let :facts do
+        {
+          :osfamily               => 'Debian',
+          :operatingsystemrelease => '12.04',
+          :operatingsystem        => 'Ubuntu',
+          :lsbdistrelease         => '12.04',
+          :concat_basedir         => '/dne',
+        }
+      end
+
+      it { should contain_file('passenger.conf').with_content(%r{PassengerRoot "/usr"}) }
+      it { should contain_file('passenger.conf').with_content(%r{PassengerRuby "/usr/bin/ruby"}) }
+      it { should contain_file('passenger.conf').without_content(/PassengerDefaultRuby/) }
+    end
+
+    context "with Ubuntu 14.04 defaults" do
+      let :facts do
+        {
+          :osfamily               => 'Debian',
+          :operatingsystemrelease => '14.04',
+          :operatingsystem        => 'Ubuntu',
+          :lsbdistrelease         => '14.04',
+          :concat_basedir         => '/dne',
+        }
+      end
+
+      it { should contain_file('passenger.conf').with_content(%r{PassengerRoot "/usr/lib/ruby/vendor_ruby/phusion_passenger/locations.ini"}) }
+      it { should contain_file('passenger.conf').without_content(/PassengerRuby/) }
+      it { should contain_file('passenger.conf').with_content(%r{PassengerDefaultRuby "/usr/bin/ruby"}) }
+    end
+
+    context "with Debian 7 defaults" do
+      let :facts do
+        {
+          :osfamily               => 'Debian',
+          :operatingsystemrelease => '7.3',
+          :operatingsystem        => 'Debian',
+          :lsbdistcodename        => 'wheezy',
+          :concat_basedir         => '/dne',
+        }
+      end
+
+      it { should contain_file('passenger.conf').with_content(%r{PassengerRoot "/usr"}) }
+      it { should contain_file('passenger.conf').with_content(%r{PassengerRuby "/usr/bin/ruby"}) }
+      it { should contain_file('passenger.conf').without_content(/PassengerDefaultRuby/) }
+    end
   end
+
   context "on a RedHat OS" do
     let :facts do
       {
diff --git a/templates/mod/passenger.conf.erb b/templates/mod/passenger.conf.erb
index 63c3f9e61..dd9eee3b1 100644
--- a/templates/mod/passenger.conf.erb
+++ b/templates/mod/passenger.conf.erb
@@ -7,6 +7,9 @@
   <%- if @passenger_ruby -%>
   PassengerRuby "<%= @passenger_ruby %>"
   <%- end -%>
+  <%- if @passenger_default_ruby -%>
+  PassengerDefaultRuby "<%= @passenger_default_ruby %>"
+  <%- end -%>
   <%- if @passenger_high_performance -%>
   PassengerHighPerformance <%= @passenger_high_performance %>
   <%- end -%>