diff --git a/contrib/bin/fusiondirectory-setup b/contrib/bin/fusiondirectory-setup
index 2df4133a5930a30e4eeb138c4acc78049e447f13..12fb1c6f00a99bc0a86161663e1b969c2bef7912 100644
--- a/contrib/bin/fusiondirectory-setup
+++ b/contrib/bin/fusiondirectory-setup
@@ -1133,7 +1133,7 @@ sub install_plugins {
 
   chdir ($dir) or die ("! Unable to move to $dir\n");
 
-  foreach my $plugin_path (@plugins){
+  foreach my $plugin_path (@plugins) {
     $plugin_path =~ /^$tmp_plugins_dir\/$name\/(.*)$/;
     my $plugin = $1;
 
@@ -1143,33 +1143,32 @@ sub install_plugins {
     # copy admin into plugins
     create_and_copy_plugin_dir($plugin_path."/admin/", $vars{fd_home}."/plugins/admin/");
 
+    # copy config into plugins
+    create_and_copy_plugin_dir($plugin_path."/config/", $vars{fd_home}."/plugins/config/");
+
     # copy personal into plugins
     create_and_copy_plugin_dir($plugin_path."/personal/", $vars{fd_home}."/plugins/personal/");
 
-    # copy extra theme templates
-    create_and_copy_plugin_dir($plugin_path."/ihtml/", $vars{fd_home}."/ihtml/");
-
-    # copy extra theme icons
-    create_and_copy_plugin_dir($plugin_path."/html/themes/", $vars{fd_home}."/html/themes/");
-
     # copy extra HTML and images
-    create_and_copy_plugin_dir($plugin_path."/html/", $vars{fd_home}."/html/plugins/".$plugin);
+    create_and_copy_plugin_dir($plugin_path."/html/", $vars{fd_home}."/html/");
 
-    # copy contrib
-    create_and_copy_plugin_dir($plugin_path."/contrib/", $vars{fd_home}."/doc/contrib/".$plugin);
+    # copy extra theme templates
+    create_and_copy_plugin_dir($plugin_path."/ihtml/", $vars{fd_home}."/ihtml/");
 
-    # copy config
-    create_and_copy_plugin_dir($plugin_path."/config/", $vars{fd_home}."/plugins/config/");
+    # copy includes
+    create_and_copy_plugin_dir($plugin_path."/include/", $vars{fd_home}."/include/");
 
     # copy ldap schema
     create_and_copy_plugin_dir($plugin_path."/contrib/openldap/", $vars{fd_home}."/contrib/openldap/");
 
-    # copy includes
-    create_and_copy_plugin_dir($plugin_path."/include/", $vars{fd_home}."/include/");
+    # copy etc files
+    create_and_copy_plugin_dir($plugin_path."/contrib/etc/", $vars{fd_config_dir}."/".$plugin."/");
 
-    # copy the locales
-    create_and_copy_plugin_dir($plugin_path."/locale/", $vars{fd_home}."/locale/plugins/".$plugin);
+    # copy doc
+    create_and_copy_plugin_dir($plugin_path."/contrib/doc/", $vars{fd_home}."/contrib/doc/");
 
+    # copy the locales
+    create_and_copy_plugin_dir($plugin_path."/locale/", $vars{fd_home}."/locale/plugins/".$plugin."/locale/");
   }
 
   #finally update FusionDirectory's class.cache and locales