diff --git a/manifests/main/dirs.pp b/manifests/main/dirs.pp
index 896ccf6..e3ae64a 100644
--- a/manifests/main/dirs.pp
+++ b/manifests/main/dirs.pp
@@ -18,4 +18,15 @@ class confdroid_ssh::main::dirs (
     seltype  => etc_t,
     seluser  => system_u,
   }
+
+  file { $sshd_custom_path:
+    ensure   => directory,
+    owner    => $sshd_user,
+    group    => $sshd_user,
+    mode     => '0755',
+    selrange => s0,
+    selrole  => object_r,
+    seltype  => etc_t,
+    seluser  => system_u,
+  }
 }
diff --git a/manifests/main/files.pp b/manifests/main/files.pp
index 8a0b862..43bca54 100644
--- a/manifests/main/files.pp
+++ b/manifests/main/files.pp
@@ -19,4 +19,13 @@ class confdroid_ssh::main::files (
     seluser  => system_u,
     content  => template($sshd_config_erb),
   }
+
+  if $ssh_manage_config {
+    file { "${ssh_etc_path}/sshd_config.d":
+      ensure => directory,
+      owner  => 'root',
+      group  => 'root',
+      mode   => '0755',
+    }
+  }
 }
diff --git a/manifests/params.pp b/manifests/params.pp
index e0b3ffb..522f7b6 100644
--- a/manifests/params.pp
+++ b/manifests/params.pp
@@ -20,6 +20,9 @@ class confdroid_ssh::params (
   String $ssh_fw_order       = '50',
   String $ssh_source_range   = '0.0.0.0/0',
 
+  # main configuration 
+  Boolean $ssh_manage_config = true,
+
 ) {
 # default facts
   $fqdn                     = $facts['networking']['fqdn']
@@ -32,6 +35,7 @@ class confdroid_ssh::params (
   $ssh_etc_path       = '/etc/ssh'
   $sshd_service       = 'sshd'
   $sshd_config_path   = "${ssh_etc_path}/sshd_config"
+  $sshd_custom_path   = "${ssh_etc_path}/sshd_config.d"
   $sshd_config_erb    = 'confdroid_ssh/ssh_config.erb'
 
   # includes must be last
diff --git a/templates/ssh_custom_conf.erb b/templates/ssh_custom_conf.erb
new file mode 100644
index 0000000..a6d7920
--- /dev/null
+++ b/templates/ssh_custom_conf.erb
@@ -0,0 +1,7 @@
+###############################################################################    
+##### DO NOT EDIT THIS FILE MANUALLY                                          #
+##### This file is managed by Puppet. Any changes to this file will be        #
+##### overwritten. The file is built via parameters, so any changes should    #
+##### be made in the Puppet manifest parameters.                              #
+###############################################################################
+