diff --git a/spec/classes/php_spec.rb b/spec/classes/php_spec.rb
index 135626a..35c8862 100644
--- a/spec/classes/php_spec.rb
+++ b/spec/classes/php_spec.rb
@@ -1,375 +1,387 @@
 require 'spec_helper'
 
 describe 'php', type: :class do
   on_supported_os.each do |os, facts|
     context "on #{os}" do
       let :facts do
         facts
       end
 
       php_cli_package = case facts[:os]['name']
                         when 'Debian'
                           case facts[:os]['release']['major']
+                          when '11'
+                            'php7.4-cli'
                           when '10'
                             'php7.3-cli'
                           when '9'
                             'php7.0-cli'
                           else
                             'php5-cli'
                           end
                         when 'Ubuntu'
                           case facts[:os]['release']['major']
                           when '20.04'
                             'php7.4-cli'
                           when '18.04'
                             'php7.2-cli'
                           when '16.04'
                             'php7.0-cli'
                           else
                             'php5-cli'
                           end
                         end
       php_fpm_package = case facts[:os]['name']
                         when 'Debian'
                           case facts[:os]['release']['major']
+                          when '11'
+                            'php7.4-fpm'
                           when '10'
                             'php7.3-fpm'
                           when '9'
                             'php7.0-fpm'
                           else
                             'php5-fpm'
                           end
                         when 'Ubuntu'
                           case facts[:os]['release']['major']
                           when '20.04'
                             'php7.4-fpm'
                           when '18.04'
                             'php7.2-fpm'
                           when '16.04'
                             'php7.0-fpm'
                           else
                             'php5-fpm'
                           end
                         end
       php_dev_package = case facts[:os]['name']
                         when 'Debian'
                           case facts[:os]['release']['major']
+                          when '11'
+                            'php7.4-dev'
                           when '10'
                             'php7.3-dev'
                           when '9'
                             'php7.0-dev'
                           else
                             'php5-dev'
                           end
                         when 'Ubuntu'
                           case facts[:os]['release']['major']
                           when '20.04'
                             'php7.4-dev'
                           when '18.04'
                             'php7.2-dev'
                           when '16.04'
                             'php7.0-dev'
                           else
                             'php5-dev'
                           end
                         end
       describe 'works without params' do
         it { is_expected.to compile.with_all_deps }
       end
       describe 'when called with no parameters' do
         case facts[:osfamily]
         when 'Suse', 'RedHat', 'CentOS'
           it { is_expected.to contain_class('php::global') }
         end
 
         case facts[:osfamily]
         when 'Debian'
           it { is_expected.not_to contain_class('php::global') }
           it { is_expected.to contain_class('php::fpm') }
           it { is_expected.to contain_package('php-pear').with_ensure('present') }
           it { is_expected.to contain_class('php::composer') }
           it { is_expected.to contain_package(php_cli_package).with_ensure('present') }
           it { is_expected.to contain_package(php_fpm_package).with_ensure('present') }
           it { is_expected.to contain_package(php_dev_package).with_ensure('present') }
         when 'Suse'
           it { is_expected.to contain_package('php5').with_ensure('present') }
           it { is_expected.to contain_package('php5-devel').with_ensure('present') }
           it { is_expected.to contain_package('php5-pear').with_ensure('present') }
           it { is_expected.not_to contain_package('php5-cli') }
           it { is_expected.not_to contain_package('php5-dev') }
           it { is_expected.not_to contain_package('php-pear') }
         when 'RedHat', 'CentOS'
           it { is_expected.to contain_package('php-cli').with_ensure('present') }
           it { is_expected.to contain_package('php-common').with_ensure('present') }
         end
       end
 
       describe 'when called with extensions' do
         let(:params) { { extensions: { xml: {} } } }
 
         it { is_expected.to contain_php__extension('xml').with_ensure('present') }
       end
 
       describe 'when called with ensure absent and extensions' do
         extensions = { xml: {} }
         let(:params) { { ensure: 'absent', extensions: extensions } }
 
         it { is_expected.to contain_php__extension('xml').with_ensure('absent') }
 
         case facts[:osfamily]
         when 'Debian'
           it { is_expected.to contain_package(php_cli_package).with_ensure('absent') }
           it { is_expected.to contain_package(php_fpm_package).with_ensure('absent') }
           it { is_expected.to contain_package(php_dev_package).with_ensure('absent') }
         when 'Suse'
           it { is_expected.to contain_package('php5').with_ensure('absent') }
           it { is_expected.to contain_package('php5-devel').with_ensure('absent') }
         when 'RedHat', 'CentOS'
           it { is_expected.to contain_package('php-cli').with_ensure('absent') }
           it { is_expected.to contain_package('php-common').with_ensure('absent') }
         end
       end
 
       describe 'when called with package_prefix parameter' do
         package_prefix = 'myphp-'
         let(:params) { { package_prefix: package_prefix } }
 
         case facts[:osfamily]
         when 'Suse', 'RedHat', 'CentOS'
           it { is_expected.to contain_class('php::global') }
         end
 
         case facts[:osfamily]
         when 'Debian', 'RedHat', 'CentOS'
           it { is_expected.to contain_package("#{package_prefix}cli").with_ensure('present') }
         end
 
         case facts[:osfamily]
         when 'Debian'
           it { is_expected.not_to contain_class('php::global') }
           it { is_expected.to contain_class('php::fpm') }
           it { is_expected.to contain_class('php::composer') }
           it { is_expected.to contain_package('php-pear').with_ensure('present') }
           it { is_expected.to contain_package("#{package_prefix}dev").with_ensure('present') }
           it { is_expected.to contain_package("#{package_prefix}fpm").with_ensure('present') }
         when 'Suse'
           it { is_expected.to contain_package('php5').with_ensure('present') }
           it { is_expected.to contain_package("#{package_prefix}devel").with_ensure('present') }
           it { is_expected.to contain_package("#{package_prefix}pear").with_ensure('present') }
           it { is_expected.not_to contain_package("#{package_prefix}cli").with_ensure('present') }
           it { is_expected.not_to contain_package("#{package_prefix}dev") }
           it { is_expected.not_to contain_package('php-pear') }
         when 'RedHat', 'CentOS'
           it { is_expected.to contain_package("#{package_prefix}common").with_ensure('present') }
         end
       end
 
       describe 'when called with fpm_user parameter' do
         let(:params) { { fpm_user: 'nginx' } }
 
         it { is_expected.to contain_class('php::fpm').with(user: 'nginx') }
         it { is_expected.to contain_php__fpm__pool('www').with(user: 'nginx') }
 
         dstfile = case facts[:osfamily]
                   when 'Debian'
                     case facts[:os]['name']
                     when 'Debian'
                       case facts[:os]['release']['major']
+                      when '11'
+                        '/etc/php/7.4/fpm/pool.d/www.conf'
                       when '10'
                         '/etc/php/7.3/fpm/pool.d/www.conf'
                       when '9'
                         '/etc/php/7.0/fpm/pool.d/www.conf'
                       else
                         '/etc/php5/fpm/pool.d/www.conf'
                       end
                     when 'Ubuntu'
                       case facts[:os]['release']['major']
                       when '20.04'
                         '/etc/php/7.4/fpm/pool.d/www.conf'
                       when '18.04'
                         '/etc/php/7.2/fpm/pool.d/www.conf'
                       when '16.04'
                         '/etc/php/7.0/fpm/pool.d/www.conf'
                       else
                         '/etc/php5/fpm/pool.d/www.conf'
                       end
                     end
                   when 'Archlinux'
                     '/etc/php/php-fpm.d/www.conf'
                   when 'Suse'
                     '/etc/php5/fpm/pool.d/www.conf'
                   when 'RedHat'
                     '/etc/php-fpm.d/www.conf'
                   when 'FreeBSD'
                     '/usr/local/etc/php-fpm.d/www.conf'
                   end
 
         it { is_expected.to contain_file(dstfile).with_content(%r{user = nginx}) }
       end
       describe 'when called with fpm_group parameter' do
         let(:params) { { fpm_group: 'nginx' } }
 
         it { is_expected.to contain_class('php::fpm').with(group: 'nginx') }
         it { is_expected.to contain_php__fpm__pool('www').with(group: 'nginx') }
 
         dstfile = case facts[:osfamily]
                   when 'Debian'
                     case facts[:os]['name']
                     when 'Debian'
                       case facts[:os]['release']['major']
+                      when '11'
+                        '/etc/php/7.4/fpm/pool.d/www.conf'
                       when '10'
                         '/etc/php/7.3/fpm/pool.d/www.conf'
                       when '9'
                         '/etc/php/7.0/fpm/pool.d/www.conf'
                       else
                         '/etc/php5/fpm/pool.d/www.conf'
                       end
                     when 'Ubuntu'
                       case facts[:os]['release']['major']
                       when '20.04'
                         '/etc/php/7.4/fpm/pool.d/www.conf'
                       when '18.04'
                         '/etc/php/7.2/fpm/pool.d/www.conf'
                       when '16.04'
                         '/etc/php/7.0/fpm/pool.d/www.conf'
                       else
                         '/etc/php5/fpm/pool.d/www.conf'
                       end
                     end
                   when 'Archlinux'
                     '/etc/php/php-fpm.d/www.conf'
                   when 'Suse'
                     '/etc/php5/fpm/pool.d/www.conf'
                   when 'RedHat'
                     '/etc/php-fpm.d/www.conf'
                   when 'FreeBSD'
                     '/usr/local/etc/php-fpm.d/www.conf'
                   end
 
         it { is_expected.to contain_file(dstfile).with_content(%r{group = nginx}) }
       end
 
       describe 'when configured with a pool with apparmor_hat parameter' do
         let(:params) { { fpm_pools: { 'www' => { 'apparmor_hat' => 'www' } } } }
 
         it { is_expected.to contain_php__fpm__pool('www').with(apparmor_hat: 'www') }
 
         dstfile = case facts[:osfamily]
                   when 'Debian'
                     case facts[:os]['name']
                     when 'Debian'
                       case facts[:os]['release']['major']
+                      when '11'
+                        '/etc/php/7.4/fpm/pool.d/www.conf'
                       when '10'
                         '/etc/php/7.3/fpm/pool.d/www.conf'
                       when '9'
                         '/etc/php/7.0/fpm/pool.d/www.conf'
                       else
                         '/etc/php5/fpm/pool.d/www.conf'
                       end
                     when 'Ubuntu'
                       case facts[:os]['release']['major']
                       when '20.04'
                         '/etc/php/7.4/fpm/pool.d/www.conf'
                       when '18.04'
                         '/etc/php/7.2/fpm/pool.d/www.conf'
                       when '16.04'
                         '/etc/php/7.0/fpm/pool.d/www.conf'
                       else
                         '/etc/php5/fpm/pool.d/www.conf'
                       end
                     end
                   when 'Archlinux'
                     '/etc/php/php-fpm.d/www.conf'
                   when 'Suse'
                     '/etc/php5/fpm/pool.d/www.conf'
                   when 'RedHat'
                     '/etc/php-fpm.d/www.conf'
                   when 'FreeBSD'
                     '/usr/local/etc/php-fpm.d/www.conf'
                   end
 
         it { is_expected.to contain_file(dstfile).with_content(%r{apparmor_hat = www}) }
       end
 
       describe 'when fpm is disabled' do
         let(:params) { { fpm: false } }
 
         it { is_expected.not_to contain_class('php::fpm') }
       end
 
       describe 'when composer is disabled' do
         let(:params) { { composer: false } }
 
         it { is_expected.not_to contain_class('php::composer') }
       end
 
       if facts[:osfamily] == 'RedHat' || facts[:osfamily] == 'CentOS'
         describe 'when called with cli_settings parameter' do
           let(:params) do
             {
               'settings'     => { 'PHP/memory_limit' => '300M' },
               'cli_settings' => { 'PHP/memory_limit' => '1000M' }
             }
           end
 
           it { is_expected.to contain_php__config__setting('/etc/php.ini: PHP/memory_limit').with_value('300M') }
           it { is_expected.to contain_php__config__setting('/etc/php-fpm.ini: PHP/memory_limit').with_value('300M') }
           it { is_expected.to contain_php__config__setting('/etc/php-cli.ini: PHP/memory_limit').with_value('1000M') }
         end
 
         describe 'when called with global option for rhscl_mode' do
           describe 'when called with mode "remi"' do
             scl_php_version = 'php56'
             rhscl_mode = 'remi'
             let(:pre_condition) do
               "class {'::php::globals':
                         php_version => '#{scl_php_version}',
                         rhscl_mode => '#{rhscl_mode}'
               }"
             end
             let(:params) do
               { settings: { 'Date/date.timezone' => 'Europe/Berlin' } }
             end
 
             it { is_expected.to contain_class('php::global') }
             it { is_expected.to contain_package("#{scl_php_version}-php-cli").with_ensure('present') }
             it { is_expected.to contain_package("#{scl_php_version}-php-common").with_ensure('present') }
             it { is_expected.to contain_php__config('global').with(file: "/etc/opt/#{rhscl_mode}/#{scl_php_version}/php.ini") }
             it { is_expected.not_to contain_php__config('cli') }
 
             # see: https://github.com/voxpupuli/puppet-php/blob/master/lib/puppet/parser/functions/to_hash_settings.rb
             it { is_expected.to contain_php__config__setting("/etc/opt/#{rhscl_mode}/#{scl_php_version}/php.ini: Date/date.timezone").with_value('Europe/Berlin') }
           end
 
           describe 'when called with mode "rhscl"' do
             scl_php_version = 'rh-php56'
             rhscl_mode = 'rhscl'
             let(:pre_condition) do
               "class {'::php::globals':
                         php_version => '#{scl_php_version}',
                         rhscl_mode => '#{rhscl_mode}'
               }"
             end
             let(:params) do
               { settings: { 'Date/date.timezone' => 'Europe/Berlin' } }
             end
 
             it { is_expected.to contain_class('php::global') }
             it { is_expected.to contain_package("#{scl_php_version}-php-cli").with_ensure('present') }
             it { is_expected.to contain_package("#{scl_php_version}-php-common").with_ensure('present') }
             it { is_expected.to contain_php__config('global').with(file: "/etc/opt/rh/#{scl_php_version}/php.ini") }
             it { is_expected.to contain_php__config('cli').with(file: "/etc/opt/rh/#{scl_php_version}/php-cli.ini") }
             it { is_expected.to contain_php__config__setting("/etc/opt/rh/#{scl_php_version}/php.ini: Date/date.timezone").with_value('Europe/Berlin') }
           end
         end
       end
 
       describe 'when called with pool_purge => true and fpm_pools => {}' do
         let(:params) { { pool_purge: true, fpm_pools: {} } }
 
         it { is_expected.to contain_class('php::fpm').with(pool_purge: true) }
         it { is_expected.not_to contain_php__fpm__pool('www') }
       end
     end
   end
 end
diff --git a/spec/defines/extension_spec.rb b/spec/defines/extension_spec.rb
index 2278c6f..32e2612 100644
--- a/spec/defines/extension_spec.rb
+++ b/spec/defines/extension_spec.rb
@@ -1,264 +1,266 @@
 require 'spec_helper'
 
 describe 'php::extension' do
   on_supported_os.each do |os, facts|
     context "on #{os}" do
       let :facts do
         facts
       end
       let(:pre_condition) { 'include php' }
 
       unless facts[:osfamily] == 'Suse' || facts[:osfamily] == 'FreeBSD' # FIXME: something is wrong on these
         etcdir =  case facts[:os]['name']
                   when 'Debian'
                     case facts[:os]['release']['major']
+                    when '11'
+                      '/etc/php/7.4/mods-available'
                     when '10'
                       '/etc/php/7.3/mods-available'
                     when '9'
                       '/etc/php/7.0/mods-available'
                     else
                       '/etc/php5/mods-available'
                     end
                   when 'Ubuntu'
                     case facts[:os]['release']['major']
                     when '20.04'
                       '/etc/php/7.4/mods-available'
                     when '18.04'
                       '/etc/php/7.2/mods-available'
                     when '16.04'
                       '/etc/php/7.0/mods-available'
                     else
                       '/etc/php5/mods-available'
                     end
                   when 'Archlinux'
                     '/etc/php/conf.d'
                   else
                     '/etc/php.d'
                   end
 
         context 'installation from repository' do
           let(:title) { 'json' }
           let(:params) do
             {
               package_prefix: 'php5-',
               settings: {
                 'test' => 'foo'
               }
             }
           end
 
           it { is_expected.to contain_package('php5-json') }
           it do
             is_expected.to contain_php__config('json').with(
               file: "#{etcdir}/json.ini",
               config: {
                 'extension' => 'json.so',
                 'test'      => 'foo'
               }
             )
           end
         end
 
         context 'configure extension without installing a package' do
           let(:title) { 'json' }
           let(:params) do
             {
               provider: 'none',
               settings: {
                 'test' => 'foo'
               }
             }
           end
 
           it do
             is_expected.to contain_php__config('json').with(
               file: "#{etcdir}/json.ini",
               require: nil,
               config: {
                 'extension' => 'json.so',
                 'test'      => 'foo'
               }
             )
           end
         end
 
         context 'add settings prefix if requested' do
           let(:title) { 'json' }
           let(:params) do
             {
               name: 'json',
               settings_prefix: true,
               settings: {
                 'test' => 'foo'
               }
             }
           end
 
           it do
             is_expected.to contain_php__config('json').with(
               config: {
                 'extension' => 'json.so',
                 'json.test' => 'foo'
               }
             )
           end
         end
 
         context 'use specific settings prefix if requested' do
           let(:title) { 'json' }
           let(:params) do
             {
               name: 'json',
               settings_prefix: 'bar',
               settings: {
                 'test' => 'foo'
               }
             }
           end
 
           it do
             is_expected.to contain_php__config('json').with(
               config: {
                 'extension' => 'json.so',
                 'bar.test'  => 'foo'
               }
             )
           end
         end
 
         context 'extensions can be configured as zend' do
           let(:title) { 'xdebug' }
           let(:params) do
             {
               zend: true
             }
           end
 
           it { is_expected.to contain_php__config('xdebug').with_config('zend_extension' => 'xdebug.so') }
         end
 
         context 'pecl extensions support so_name' do
           let(:title) { 'zendopcache' }
           let(:params) do
             {
               provider: 'pecl',
               zend: true,
               so_name: 'opcache'
             }
           end
 
           it do
             is_expected.to contain_php__config('zendopcache').with(
               file: "#{etcdir}/opcache.ini",
               config: {
                 'zend_extension' => 'opcache.so'
               }
             )
           end
         end
 
         context 'add ini file prefix if requested' do
           let(:title) { 'zendopcache' }
           let(:params) do
             {
               provider: 'pecl',
               zend: true,
               ini_prefix: '10-',
               so_name: 'opcache'
             }
           end
 
           it do
             is_expected.to contain_php__config('zendopcache').with(
               file: "#{etcdir}/10-opcache.ini",
               config: {
                 'zend_extension' => 'opcache.so'
               }
             )
           end
         end
 
         context 'pecl extensions support php_api_version' do
           let(:title) { 'xdebug' }
           let(:params) do
             {
               provider: 'pecl',
               zend: true,
               php_api_version: '20100525'
             }
           end
 
           it { is_expected.to contain_php__config('xdebug').with_config('zend_extension' => '/usr/lib/php5/20100525/xdebug.so') }
         end
 
         if facts[:os]['family'] == 'Debian'
           context 'on Debian family' do
             context 'zend extensions call ext_tool_enable' do
               let(:title) { 'xdebug' }
               let(:params) do
                 {
                   zend: true
                 }
               end
 
               it { is_expected.to contain_exec('ext_tool_enable_xdebug') }
             end
           end
         end
 
         case facts[:os]['name']
         when 'Debian'
           context 'on Debian' do
             let(:title) { 'xdebug' }
 
             it { is_expected.to contain_php__config('xdebug').with_file("#{etcdir}/xdebug.ini") }
 
             # note to consider: As of PHP 5.2.0, the JSON extension is bundled and compiled into PHP by default
             # http://php.net/manual/en/json.installation.php
             context 'pecl installation' do
               let(:title) { 'json' }
               let(:params) do
                 {
                   provider: 'pecl',
                   header_packages: ['libmemcached-dev'],
                   name: 'nice_name',
                   settings: {
                     'test' => 'foo'
                   }
                 }
               end
 
               it { is_expected.to contain_package('json') }
               it { is_expected.to contain_package('libmemcached-dev') }
               it { is_expected.to contain_package('build-essential') }
               it do
                 is_expected.to contain_php__config('json').with(
                   file: "#{etcdir}/nice_name.ini",
                   config: {
                     'extension' => 'nice_name.so',
                     'test'      => 'foo'
                   }
                 )
               end
             end
           end
         when 'Ubuntu'
           context 'on Ubuntu' do
             context 'do not setup mysql.ini' do
               let(:title) { 'mysql' }
               let(:params) do
                 {
                   name: 'mysql'
                 }
               end
 
               it do
                 is_expected.to contain_file("#{etcdir}/mysql.ini").with(ensure: 'absent')
               end
             end
           end
         end
       end
     end
   end
 end
diff --git a/spec/defines/fpm_pool_spec.rb b/spec/defines/fpm_pool_spec.rb
index 1deca1a..e15d468 100644
--- a/spec/defines/fpm_pool_spec.rb
+++ b/spec/defines/fpm_pool_spec.rb
@@ -1,45 +1,47 @@
 require 'spec_helper'
 
 describe 'php::fpm::pool' do
   on_supported_os.each do |os, facts|
     context "on #{os}" do
       let :facts do
         facts
       end
       let(:pre_condition) { 'include php' }
 
       case facts[:os]['name']
       when 'Debian'
         context 'plain config' do
           let(:title) { 'unique-name' }
           let(:params) { {} }
 
           case facts[:os]['release']['major']
+          when '11'
+            it { is_expected.to contain_file('/etc/php/7.4/fpm/pool.d/unique-name.conf') }
           when '10'
             it { is_expected.to contain_file('/etc/php/7.3/fpm/pool.d/unique-name.conf') }
           when '9'
             it { is_expected.to contain_file('/etc/php/7.0/fpm/pool.d/unique-name.conf') }
           else
             it { is_expected.to contain_file('/etc/php5/fpm/pool.d/unique-name.conf') }
           end
         end
       when 'Ubuntu'
         context 'plain config' do
           let(:title) { 'unique-name' }
           let(:params) { {} }
 
           case facts[:os]['release']['major']
           when '20.04'
             it { is_expected.to contain_file('/etc/php/7.4/fpm/pool.d/unique-name.conf') }
           when '18.04'
             it { is_expected.to contain_file('/etc/php/7.2/fpm/pool.d/unique-name.conf') }
           when '16.04'
             it { is_expected.to contain_file('/etc/php/7.0/fpm/pool.d/unique-name.conf') }
           else
             it { is_expected.to contain_file('/etc/php5/fpm/pool.d/unique-name.conf') }
           end
         end
       end
     end
   end
 end