diff --git a/manifests/default_mods.pp b/manifests/default_mods.pp
index 879df595c1..2e82d4d930 100644
--- a/manifests/default_mods.pp
+++ b/manifests/default_mods.pp
@@ -18,6 +18,9 @@
             ::apache::mod { 'systemd': }
           }
         }
+        if ($::operatingsystem == 'Amazon' and $::operatingsystemrelease == '2') {
+          ::apache::mod { 'systemd': }
+        }
         ::apache::mod { 'unixd': }
       }
     }
diff --git a/manifests/mod.pp b/manifests/mod.pp
index 721b90b071..c7f3908d1e 100644
--- a/manifests/mod.pp
+++ b/manifests/mod.pp
@@ -50,7 +50,7 @@
   if $package {
     $_package = $package
   } elsif has_key($mod_packages, $mod) { # 2.6 compatibility hack
-    if ($::apache::apache_version == '2.4' and $::operatingsystem =~ /^[Aa]mazon$/) {
+    if ($::apache::apache_version == '2.4' and $::operatingsystem =~ /^[Aa]mazon$/ and $::operatingsystemmajrelease != '2') {
       # On amazon linux we need to prefix our package name with mod24 instead of mod to support apache 2.4
       $_package = regsubst($mod_packages[$mod],'^(mod_)?(.*)','mod24_\2')
     } else {
diff --git a/manifests/params.pp b/manifests/params.pp
index 5365f533e4..16d071a02d 100644
--- a/manifests/params.pp
+++ b/manifests/params.pp
@@ -173,9 +173,14 @@
     $conf_dir             = "${httpd_dir}/conf"
     $confd_dir            = "${httpd_dir}/conf.d"
     $conf_enabled         = undef
-    $mod_dir              = $::apache::version::distrelease ? {
-      '7'     => "${httpd_dir}/conf.modules.d",
-      default => "${httpd_dir}/conf.d",
+    if $::operatingsystem =~ /^[Aa]mazon$/ and $::operatingsystemmajrelease == '2' {
+      # Amazon Linux 2 uses the /conf.modules.d/ dir
+      $mod_dir            = "${httpd_dir}/conf.modules.d"
+    } else {
+      $mod_dir              = $::apache::version::distrelease ? {
+        '7'     => "${httpd_dir}/conf.modules.d",
+        default => "${httpd_dir}/conf.d",
+      }
     }
     $mod_enable_dir       = undef
     $vhost_dir            = "${httpd_dir}/conf.d"