diff --git a/README.md b/README.md
index a43a1cd..01ba138 100644
--- a/README.md
+++ b/README.md
@@ -1,6 +1,6 @@
-# CIS Debian 7 Hardening
+# CIS Debian 7/8 Hardening
 
-Modular Debian 7 security hardening scripts based on [cisecurity.org](https://www.cisecurity.org)
+Modular Debian 7/8 security hardening scripts based on [cisecurity.org](https://www.cisecurity.org)
 recommendations. We use it at [OVH](https://www.ovh.com) to harden our PCI-DSS infrastructure.
 
 ```console
@@ -133,6 +133,7 @@ Additionally, quoting the License:
 
 - **Center for Internet Security**: https://www.cisecurity.org/
 - **CIS recommendations**: https://benchmarks.cisecurity.org/downloads/show-single/index.cfm?file=debian7.100
+- **CIS recommendations**: https://benchmarks.cisecurity.org/downloads/show-single/index.cfm?file=debian8.100
 
 ## License
 
diff --git a/bin/hardening.sh b/bin/hardening.sh
index 3bd43ee..573fe26 100755
--- a/bin/hardening.sh
+++ b/bin/hardening.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 
 #
-# CIS Debian 7 Hardening
+# CIS Debian 7/8 Hardening
 # Authors : Thibault Dewailly, OVH <thibault.dewailly@corp.ovh.com>
 #
 
diff --git a/bin/hardening/1.1_install_updates.sh b/bin/hardening/1.1_install_updates.sh
index 7d1d787..1f8dad9 100755
--- a/bin/hardening/1.1_install_updates.sh
+++ b/bin/hardening/1.1_install_updates.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 
 #
-# CIS Debian 7 Hardening
+# CIS Debian 7/8 Hardening
 #
 
 #
diff --git a/bin/hardening/10.1.1_set_password_exp_days.sh b/bin/hardening/10.1.1_set_password_exp_days.sh
index b387c5a..a1e4d60 100755
--- a/bin/hardening/10.1.1_set_password_exp_days.sh
+++ b/bin/hardening/10.1.1_set_password_exp_days.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 
 #
-# CIS Debian 7 Hardening
+# CIS Debian 7/8 Hardening
 #
 
 #
diff --git a/bin/hardening/10.1.2_set_password_min_days_change.sh b/bin/hardening/10.1.2_set_password_min_days_change.sh
index e6b7b47..48e9190 100755
--- a/bin/hardening/10.1.2_set_password_min_days_change.sh
+++ b/bin/hardening/10.1.2_set_password_min_days_change.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 
 #
-# CIS Debian 7 Hardening
+# CIS Debian 7/8 Hardening
 #
 
 #
diff --git a/bin/hardening/10.1.3_set_password_exp_warning_days.sh b/bin/hardening/10.1.3_set_password_exp_warning_days.sh
index 83ca246..32f161f 100755
--- a/bin/hardening/10.1.3_set_password_exp_warning_days.sh
+++ b/bin/hardening/10.1.3_set_password_exp_warning_days.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 
 #
-# CIS Debian 7 Hardening
+# CIS Debian 7/8 Hardening
 #
 
 #
diff --git a/bin/hardening/10.2_disable_system_accounts.sh b/bin/hardening/10.2_disable_system_accounts.sh
index 8b5ec97..6b6667e 100755
--- a/bin/hardening/10.2_disable_system_accounts.sh
+++ b/bin/hardening/10.2_disable_system_accounts.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 
 #
-# CIS Debian 7 Hardening
+# CIS Debian 7/8 Hardening
 #
 
 #
@@ -18,7 +18,8 @@ RESULT=''
 # This function will be called if the script status is on enabled / audit mode
 audit () {
     info "Checking if admin accounts have a login shell different than $SHELL"
-    RESULT=$(egrep -v "^\+" $FILE | awk -F: '($1!="root" && $1!="sync" && $1!="shutdown" && $1!="halt" && $3<1000 && $7!="/usr/sbin/nologin" && $7!="/bin/false") {print}') 
+    RESULT=$(egrep -v "^\+" $FILE | awk -F: '($1!="root" && $1!="sync" && $1!="shutdown" && $1!="halt" && $3<1000 && $7!="/usr/sbin/nologin" && $7!="/bin/false") {print}')
+    IFS=$'\n'
     for LINE in $RESULT; do
         debug "line : $LINE"
         ACCOUNT=$( echo $LINE | cut -d: -f 1 )
@@ -43,6 +44,7 @@ audit () {
 # This function will be called if the script status is on enabled mode
 apply () {
     RESULT=$(egrep -v "^\+" $FILE | awk -F: '($1!="root" && $1!="sync" && $1!="shutdown" && $1!="halt" && $3<1000 && $7!="/usr/sbin/nologin" && $7!="/bin/false") {print}')
+    IFS=$'\n'
     for LINE in $RESULT; do
         debug "line : $LINE"
         ACCOUNT=$( echo $LINE | cut -d: -f 1 )
@@ -85,7 +87,7 @@ else
         echo "No CIS_ROOT_DIR variable, aborting"
         exit 128
     fi
-fi 
+fi
 
 # Main function, will call the proper functions given the configuration (audit, enabled, disabled)
 if [ -r $CIS_ROOT_DIR/lib/main.sh ]; then
diff --git a/bin/hardening/10.3_default_root_group.sh b/bin/hardening/10.3_default_root_group.sh
index 4b1732f..171a533 100755
--- a/bin/hardening/10.3_default_root_group.sh
+++ b/bin/hardening/10.3_default_root_group.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 
 #
-# CIS Debian 7 Hardening
+# CIS Debian 7/8 Hardening
 #
 
 #
diff --git a/bin/hardening/10.4_default_umask.sh b/bin/hardening/10.4_default_umask.sh
index af442c0..a7ab7ea 100755
--- a/bin/hardening/10.4_default_umask.sh
+++ b/bin/hardening/10.4_default_umask.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 
 #
-# CIS Debian 7 Hardening
+# CIS Debian 7/8 Hardening
 #
 
 #
diff --git a/bin/hardening/10.5_lock_inactive_user_account.sh b/bin/hardening/10.5_lock_inactive_user_account.sh
index 68fded9..bd1ab67 100755
--- a/bin/hardening/10.5_lock_inactive_user_account.sh
+++ b/bin/hardening/10.5_lock_inactive_user_account.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 
 #
-# CIS Debian 7 Hardening
+# CIS Debian 7/8 Hardening
 #
 
 #
diff --git a/bin/hardening/11.1_warning_banners.sh b/bin/hardening/11.1_warning_banners.sh
index 43bdb51..d2a0d05 100755
--- a/bin/hardening/11.1_warning_banners.sh
+++ b/bin/hardening/11.1_warning_banners.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 
 #
-# CIS Debian 7 Hardening
+# CIS Debian 7/8 Hardening
 #
 
 #
diff --git a/bin/hardening/11.2_remove_os_info_warning_banners.sh b/bin/hardening/11.2_remove_os_info_warning_banners.sh
index 9ebe717..135d57d 100755
--- a/bin/hardening/11.2_remove_os_info_warning_banners.sh
+++ b/bin/hardening/11.2_remove_os_info_warning_banners.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 
 #
-# CIS Debian 7 Hardening
+# CIS Debian 7/8 Hardening
 #
 
 #
diff --git a/bin/hardening/11.3_graphical_warning_banners.sh b/bin/hardening/11.3_graphical_warning_banners.sh
index 82d46ee..4eecb11 100755
--- a/bin/hardening/11.3_graphical_warning_banners.sh
+++ b/bin/hardening/11.3_graphical_warning_banners.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 
 #
-# CIS Debian 7 Hardening
+# CIS Debian 7/8 Hardening
 #
 
 #
diff --git a/bin/hardening/12.10_find_suid_files.sh b/bin/hardening/12.10_find_suid_files.sh
index 2e490db..0c87ada 100755
--- a/bin/hardening/12.10_find_suid_files.sh
+++ b/bin/hardening/12.10_find_suid_files.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 
 #
-# CIS Debian 7 Hardening
+# CIS Debian 7/8 Hardening
 #
 
 #
diff --git a/bin/hardening/12.11_find_sgid_files.sh b/bin/hardening/12.11_find_sgid_files.sh
index ee98497..794a85e 100755
--- a/bin/hardening/12.11_find_sgid_files.sh
+++ b/bin/hardening/12.11_find_sgid_files.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 
 #
-# CIS Debian 7 Hardening
+# CIS Debian 7/8 Hardening
 #
 
 #
diff --git a/bin/hardening/12.1_etc_passwd_permissions.sh b/bin/hardening/12.1_etc_passwd_permissions.sh
index ea4954e..df4fb32 100755
--- a/bin/hardening/12.1_etc_passwd_permissions.sh
+++ b/bin/hardening/12.1_etc_passwd_permissions.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 
 #
-# CIS Debian 7 Hardening
+# CIS Debian 7/8 Hardening
 #
 
 #
diff --git a/bin/hardening/12.2_etc_shadow_permissions.sh b/bin/hardening/12.2_etc_shadow_permissions.sh
index 4401d17..e278fe1 100755
--- a/bin/hardening/12.2_etc_shadow_permissions.sh
+++ b/bin/hardening/12.2_etc_shadow_permissions.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 
 #
-# CIS Debian 7 Hardening
+# CIS Debian 7/8 Hardening
 #
 
 #
diff --git a/bin/hardening/12.3_etc_group_permissions.sh b/bin/hardening/12.3_etc_group_permissions.sh
index 9600939..e9e9bd1 100755
--- a/bin/hardening/12.3_etc_group_permissions.sh
+++ b/bin/hardening/12.3_etc_group_permissions.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 
 #
-# CIS Debian 7 Hardening
+# CIS Debian 7/8 Hardening
 #
 
 #
diff --git a/bin/hardening/12.4_etc_passwd_ownership.sh b/bin/hardening/12.4_etc_passwd_ownership.sh
index 99d5651..daa912a 100755
--- a/bin/hardening/12.4_etc_passwd_ownership.sh
+++ b/bin/hardening/12.4_etc_passwd_ownership.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 
 #
-# CIS Debian 7 Hardening
+# CIS Debian 7/8 Hardening
 #
 
 #
diff --git a/bin/hardening/12.5_etc_shadow_ownership.sh b/bin/hardening/12.5_etc_shadow_ownership.sh
index df280d0..713537d 100755
--- a/bin/hardening/12.5_etc_shadow_ownership.sh
+++ b/bin/hardening/12.5_etc_shadow_ownership.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 
 #
-# CIS Debian 7 Hardening
+# CIS Debian 7/8 Hardening
 #
 
 #
diff --git a/bin/hardening/12.6_etc_group_ownership.sh b/bin/hardening/12.6_etc_group_ownership.sh
index f52cae9..0e1061c 100755
--- a/bin/hardening/12.6_etc_group_ownership.sh
+++ b/bin/hardening/12.6_etc_group_ownership.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 
 #
-# CIS Debian 7 Hardening
+# CIS Debian 7/8 Hardening
 #
 
 #
diff --git a/bin/hardening/12.7_find_world_writable_file.sh b/bin/hardening/12.7_find_world_writable_file.sh
index 6353a87..4c439cc 100755
--- a/bin/hardening/12.7_find_world_writable_file.sh
+++ b/bin/hardening/12.7_find_world_writable_file.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 
 #
-# CIS Debian 7 Hardening
+# CIS Debian 7/8 Hardening
 #
 
 #
diff --git a/bin/hardening/12.8_find_unowned_files.sh b/bin/hardening/12.8_find_unowned_files.sh
index b411f42..4d44028 100755
--- a/bin/hardening/12.8_find_unowned_files.sh
+++ b/bin/hardening/12.8_find_unowned_files.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 
 #
-# CIS Debian 7 Hardening
+# CIS Debian 7/8 Hardening
 #
 
 #
diff --git a/bin/hardening/12.9_find_ungrouped_files.sh b/bin/hardening/12.9_find_ungrouped_files.sh
index ca36ece..c6bddca 100755
--- a/bin/hardening/12.9_find_ungrouped_files.sh
+++ b/bin/hardening/12.9_find_ungrouped_files.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 
 #
-# CIS Debian 7 Hardening
+# CIS Debian 7/8 Hardening
 #
 
 #
diff --git a/bin/hardening/13.10_find_user_rhosts_files.sh b/bin/hardening/13.10_find_user_rhosts_files.sh
index 1a7fc5b..a254d23 100755
--- a/bin/hardening/13.10_find_user_rhosts_files.sh
+++ b/bin/hardening/13.10_find_user_rhosts_files.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 
 #
-# CIS Debian 7 Hardening
+# CIS Debian 7/8 Hardening
 #
 
 #
diff --git a/bin/hardening/13.11_find_passwd_group_inconsistencies.sh b/bin/hardening/13.11_find_passwd_group_inconsistencies.sh
index 218f244..abc6246 100755
--- a/bin/hardening/13.11_find_passwd_group_inconsistencies.sh
+++ b/bin/hardening/13.11_find_passwd_group_inconsistencies.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 
 #
-# CIS Debian 7 Hardening
+# CIS Debian 7/8 Hardening
 #
 
 #
diff --git a/bin/hardening/13.12_users_valid_homedir.sh b/bin/hardening/13.12_users_valid_homedir.sh
index 4bf627c..4642551 100755
--- a/bin/hardening/13.12_users_valid_homedir.sh
+++ b/bin/hardening/13.12_users_valid_homedir.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 
 #
-# CIS Debian 7 Hardening
+# CIS Debian 7/8 Hardening
 #
 
 #
diff --git a/bin/hardening/13.13_check_user_homedir_ownership.sh b/bin/hardening/13.13_check_user_homedir_ownership.sh
index 10bb7cd..71fb0d6 100755
--- a/bin/hardening/13.13_check_user_homedir_ownership.sh
+++ b/bin/hardening/13.13_check_user_homedir_ownership.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 
 #
-# CIS Debian 7 Hardening
+# CIS Debian 7/8 Hardening
 #
 
 #
diff --git a/bin/hardening/13.14_check_duplicate_uid.sh b/bin/hardening/13.14_check_duplicate_uid.sh
index e67b35f..b15a68e 100755
--- a/bin/hardening/13.14_check_duplicate_uid.sh
+++ b/bin/hardening/13.14_check_duplicate_uid.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 
 #
-# CIS Debian 7 Hardening
+# CIS Debian 7/8 Hardening
 #
 
 #
diff --git a/bin/hardening/13.15_check_duplicate_gid.sh b/bin/hardening/13.15_check_duplicate_gid.sh
index 24a72b4..e1cca12 100755
--- a/bin/hardening/13.15_check_duplicate_gid.sh
+++ b/bin/hardening/13.15_check_duplicate_gid.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 
 #
-# CIS Debian 7 Hardening
+# CIS Debian 7/8 Hardening
 #
 
 #
diff --git a/bin/hardening/13.16_check_duplicate_username.sh b/bin/hardening/13.16_check_duplicate_username.sh
index c0a336e..c7b9958 100755
--- a/bin/hardening/13.16_check_duplicate_username.sh
+++ b/bin/hardening/13.16_check_duplicate_username.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 
 #
-# CIS Debian 7 Hardening
+# CIS Debian 7/8 Hardening
 #
 
 #
diff --git a/bin/hardening/13.17_check_duplicate_groupname.sh b/bin/hardening/13.17_check_duplicate_groupname.sh
index 9228b47..06bb48c 100755
--- a/bin/hardening/13.17_check_duplicate_groupname.sh
+++ b/bin/hardening/13.17_check_duplicate_groupname.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 
 #
-# CIS Debian 7 Hardening
+# CIS Debian 7/8 Hardening
 #
 
 #
diff --git a/bin/hardening/13.18_find_user_netrc_files.sh b/bin/hardening/13.18_find_user_netrc_files.sh
index fcd3c2d..77e010d 100755
--- a/bin/hardening/13.18_find_user_netrc_files.sh
+++ b/bin/hardening/13.18_find_user_netrc_files.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 
 #
-# CIS Debian 7 Hardening
+# CIS Debian 7/8 Hardening
 #
 
 #
diff --git a/bin/hardening/13.19_find_user_forward_files.sh b/bin/hardening/13.19_find_user_forward_files.sh
index 1ea0c51..df83d8d 100755
--- a/bin/hardening/13.19_find_user_forward_files.sh
+++ b/bin/hardening/13.19_find_user_forward_files.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 
 #
-# CIS Debian 7 Hardening
+# CIS Debian 7/8 Hardening
 #
 
 #
diff --git a/bin/hardening/13.1_remove_empty_password_field.sh b/bin/hardening/13.1_remove_empty_password_field.sh
index 6d5b6e7..8b85b8e 100755
--- a/bin/hardening/13.1_remove_empty_password_field.sh
+++ b/bin/hardening/13.1_remove_empty_password_field.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 
 #
-# CIS Debian 7 Hardening
+# CIS Debian 7/8 Hardening
 #
 
 #
diff --git a/bin/hardening/13.20_shadow_group_empty.sh b/bin/hardening/13.20_shadow_group_empty.sh
index 09008f8..00df1d6 100755
--- a/bin/hardening/13.20_shadow_group_empty.sh
+++ b/bin/hardening/13.20_shadow_group_empty.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 
 #
-# CIS Debian 7 Hardening
+# CIS Debian 7/8 Hardening
 #
 
 #
diff --git a/bin/hardening/13.2_remove_legacy_passwd_entries.sh b/bin/hardening/13.2_remove_legacy_passwd_entries.sh
index 45bd0d1..4a460d2 100755
--- a/bin/hardening/13.2_remove_legacy_passwd_entries.sh
+++ b/bin/hardening/13.2_remove_legacy_passwd_entries.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 
 #
-# CIS Debian 7 Hardening
+# CIS Debian 7/8 Hardening
 #
 
 #
diff --git a/bin/hardening/13.3_remove_legacy_shadow_entries.sh b/bin/hardening/13.3_remove_legacy_shadow_entries.sh
index 97f95c7..0e5fe1b 100755
--- a/bin/hardening/13.3_remove_legacy_shadow_entries.sh
+++ b/bin/hardening/13.3_remove_legacy_shadow_entries.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 
 #
-# CIS Debian 7 Hardening
+# CIS Debian 7/8 Hardening
 #
 
 #
diff --git a/bin/hardening/13.4_remove_legacy_group_entries.sh b/bin/hardening/13.4_remove_legacy_group_entries.sh
index b33b6e4..ceb9ee5 100755
--- a/bin/hardening/13.4_remove_legacy_group_entries.sh
+++ b/bin/hardening/13.4_remove_legacy_group_entries.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 
 #
-# CIS Debian 7 Hardening
+# CIS Debian 7/8 Hardening
 #
 
 #
diff --git a/bin/hardening/13.5_find_0_uid_non_root_account.sh b/bin/hardening/13.5_find_0_uid_non_root_account.sh
index 646a5da..99a6094 100755
--- a/bin/hardening/13.5_find_0_uid_non_root_account.sh
+++ b/bin/hardening/13.5_find_0_uid_non_root_account.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 
 #
-# CIS Debian 7 Hardening
+# CIS Debian 7/8 Hardening
 #
 
 #
diff --git a/bin/hardening/13.6_sanitize_root_path.sh b/bin/hardening/13.6_sanitize_root_path.sh
index 3d0e6b3..aa02810 100755
--- a/bin/hardening/13.6_sanitize_root_path.sh
+++ b/bin/hardening/13.6_sanitize_root_path.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 
 #
-# CIS Debian 7 Hardening
+# CIS Debian 7/8 Hardening
 #
 
 #
diff --git a/bin/hardening/13.7_check_user_dir_perm.sh b/bin/hardening/13.7_check_user_dir_perm.sh
index 5a6502f..13fa713 100755
--- a/bin/hardening/13.7_check_user_dir_perm.sh
+++ b/bin/hardening/13.7_check_user_dir_perm.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 
 #
-# CIS Debian 7 Hardening
+# CIS Debian 7/8 Hardening
 #
 
 #
diff --git a/bin/hardening/13.8_check_user_dot_file_perm.sh b/bin/hardening/13.8_check_user_dot_file_perm.sh
index 6d99d38..5988400 100755
--- a/bin/hardening/13.8_check_user_dot_file_perm.sh
+++ b/bin/hardening/13.8_check_user_dot_file_perm.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 
 #
-# CIS Debian 7 Hardening
+# CIS Debian 7/8 Hardening
 #
 
 #
diff --git a/bin/hardening/13.9_set_perm_on_user_netrc.sh b/bin/hardening/13.9_set_perm_on_user_netrc.sh
index 5634508..64d7940 100755
--- a/bin/hardening/13.9_set_perm_on_user_netrc.sh
+++ b/bin/hardening/13.9_set_perm_on_user_netrc.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 
 #
-# CIS Debian 7 Hardening
+# CIS Debian 7/8 Hardening
 #
 
 #
diff --git a/bin/hardening/2.10_home_nodev.sh b/bin/hardening/2.10_home_nodev.sh
index 3399108..5baba84 100755
--- a/bin/hardening/2.10_home_nodev.sh
+++ b/bin/hardening/2.10_home_nodev.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 
 #
-# CIS Debian 7 Hardening
+# CIS Debian 7/8 Hardening
 #
 
 #
diff --git a/bin/hardening/2.11_removable_device_nodev.sh b/bin/hardening/2.11_removable_device_nodev.sh
index e573a67..8aafd45 100755
--- a/bin/hardening/2.11_removable_device_nodev.sh
+++ b/bin/hardening/2.11_removable_device_nodev.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 
 #
-# CIS Debian 7 Hardening
+# CIS Debian 7/8 Hardening
 #
 
 #
diff --git a/bin/hardening/2.12_removable_device_noexec.sh b/bin/hardening/2.12_removable_device_noexec.sh
index c31b315..273fea6 100755
--- a/bin/hardening/2.12_removable_device_noexec.sh
+++ b/bin/hardening/2.12_removable_device_noexec.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 
 #
-# CIS Debian 7 Hardening
+# CIS Debian 7/8 Hardening
 #
 
 #
diff --git a/bin/hardening/2.13_removable_device_nosuid.sh b/bin/hardening/2.13_removable_device_nosuid.sh
index d5cf467..467d0b1 100755
--- a/bin/hardening/2.13_removable_device_nosuid.sh
+++ b/bin/hardening/2.13_removable_device_nosuid.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 
 #
-# CIS Debian 7 Hardening
+# CIS Debian 7/8 Hardening
 #
 
 #
diff --git a/bin/hardening/2.14_run_shm_nodev.sh b/bin/hardening/2.14_run_shm_nodev.sh
index 128de24..5e8af6c 100755
--- a/bin/hardening/2.14_run_shm_nodev.sh
+++ b/bin/hardening/2.14_run_shm_nodev.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 
 #
-# CIS Debian 7 Hardening
+# CIS Debian 7/8 Hardening
 #
 
 #
diff --git a/bin/hardening/2.15_run_shm_nosuid.sh b/bin/hardening/2.15_run_shm_nosuid.sh
index c0a73da..7985f38 100755
--- a/bin/hardening/2.15_run_shm_nosuid.sh
+++ b/bin/hardening/2.15_run_shm_nosuid.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 
 #
-# CIS Debian 7 Hardening
+# CIS Debian 7/8 Hardening
 #
 
 #
diff --git a/bin/hardening/2.16_run_shm_noexec.sh b/bin/hardening/2.16_run_shm_noexec.sh
index 2664ee4..8b10e27 100755
--- a/bin/hardening/2.16_run_shm_noexec.sh
+++ b/bin/hardening/2.16_run_shm_noexec.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 
 #
-# CIS Debian 7 Hardening
+# CIS Debian 7/8 Hardening
 #
 
 #
diff --git a/bin/hardening/2.17_sticky_bit_world_writable_folder.sh b/bin/hardening/2.17_sticky_bit_world_writable_folder.sh
index d873e5e..be4dd2b 100755
--- a/bin/hardening/2.17_sticky_bit_world_writable_folder.sh
+++ b/bin/hardening/2.17_sticky_bit_world_writable_folder.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 
 #
-# CIS Debian 7 Hardening
+# CIS Debian 7/8 Hardening
 #
 
 #
diff --git a/bin/hardening/2.18_disable_cramfs.sh b/bin/hardening/2.18_disable_cramfs.sh
index 83b5d97..209c0bf 100755
--- a/bin/hardening/2.18_disable_cramfs.sh
+++ b/bin/hardening/2.18_disable_cramfs.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 
 #
-# CIS Debian 7 Hardening
+# CIS Debian 7/8 Hardening
 #
 
 #
diff --git a/bin/hardening/2.19_disable_freevxfs.sh b/bin/hardening/2.19_disable_freevxfs.sh
index 1e01cec..def44ee 100755
--- a/bin/hardening/2.19_disable_freevxfs.sh
+++ b/bin/hardening/2.19_disable_freevxfs.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 
 #
-# CIS Debian 7 Hardening
+# CIS Debian 7/8 Hardening
 #
 
 #
diff --git a/bin/hardening/2.1_tmp_partition.sh b/bin/hardening/2.1_tmp_partition.sh
index 903d9f3..8e68e09 100755
--- a/bin/hardening/2.1_tmp_partition.sh
+++ b/bin/hardening/2.1_tmp_partition.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 
 #
-# CIS Debian 7 Hardening
+# CIS Debian 7/8 Hardening
 #
 
 #
diff --git a/bin/hardening/2.20_disable_jffs2.sh b/bin/hardening/2.20_disable_jffs2.sh
index 8f81d01..8524a64 100755
--- a/bin/hardening/2.20_disable_jffs2.sh
+++ b/bin/hardening/2.20_disable_jffs2.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 
 #
-# CIS Debian 7 Hardening
+# CIS Debian 7/8 Hardening
 #
 
 #
diff --git a/bin/hardening/2.21_disable_hfs.sh b/bin/hardening/2.21_disable_hfs.sh
index 105f829..953664e 100755
--- a/bin/hardening/2.21_disable_hfs.sh
+++ b/bin/hardening/2.21_disable_hfs.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 
 #
-# CIS Debian 7 Hardening
+# CIS Debian 7/8 Hardening
 #
 
 #
diff --git a/bin/hardening/2.22_disable_hfsplus.sh b/bin/hardening/2.22_disable_hfsplus.sh
index 27d11fe..b90d5c5 100755
--- a/bin/hardening/2.22_disable_hfsplus.sh
+++ b/bin/hardening/2.22_disable_hfsplus.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 
 #
-# CIS Debian 7 Hardening
+# CIS Debian 7/8 Hardening
 #
 
 #
diff --git a/bin/hardening/2.23_disable_squashfs.sh b/bin/hardening/2.23_disable_squashfs.sh
index 537cc13..104daea 100755
--- a/bin/hardening/2.23_disable_squashfs.sh
+++ b/bin/hardening/2.23_disable_squashfs.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 
 #
-# CIS Debian 7 Hardening
+# CIS Debian 7/8 Hardening
 #
 
 #
diff --git a/bin/hardening/2.24_disable_udf.sh b/bin/hardening/2.24_disable_udf.sh
index efe26ef..39f8a7b 100755
--- a/bin/hardening/2.24_disable_udf.sh
+++ b/bin/hardening/2.24_disable_udf.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 
 #
-# CIS Debian 7 Hardening
+# CIS Debian 7/8 Hardening
 #
 
 #
diff --git a/bin/hardening/2.25_disable_automounting.sh b/bin/hardening/2.25_disable_automounting.sh
index 8414662..478ebc6 100755
--- a/bin/hardening/2.25_disable_automounting.sh
+++ b/bin/hardening/2.25_disable_automounting.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 
 #
-# CIS Debian 7 Hardening
+# CIS Debian 7/8 Hardening
 #
 
 #
diff --git a/bin/hardening/2.2_tmp_nodev.sh b/bin/hardening/2.2_tmp_nodev.sh
index af230da..4c0ae34 100755
--- a/bin/hardening/2.2_tmp_nodev.sh
+++ b/bin/hardening/2.2_tmp_nodev.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 
 #
-# CIS Debian 7 Hardening
+# CIS Debian 7/8 Hardening
 #
 
 #
diff --git a/bin/hardening/2.3_tmp_nosuid.sh b/bin/hardening/2.3_tmp_nosuid.sh
index e92a154..c27685a 100755
--- a/bin/hardening/2.3_tmp_nosuid.sh
+++ b/bin/hardening/2.3_tmp_nosuid.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 
 #
-# CIS Debian 7 Hardening
+# CIS Debian 7/8 Hardening
 #
 
 #
diff --git a/bin/hardening/2.4_tmp_noexec.sh b/bin/hardening/2.4_tmp_noexec.sh
index 007c3d1..a67ceb3 100755
--- a/bin/hardening/2.4_tmp_noexec.sh
+++ b/bin/hardening/2.4_tmp_noexec.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 
 #
-# CIS Debian 7 Hardening
+# CIS Debian 7/8 Hardening
 #
 
 #
diff --git a/bin/hardening/2.5_var_partition.sh b/bin/hardening/2.5_var_partition.sh
index a462a4e..cefe7b6 100755
--- a/bin/hardening/2.5_var_partition.sh
+++ b/bin/hardening/2.5_var_partition.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 
 #
-# CIS Debian 7 Hardening
+# CIS Debian 7/8 Hardening
 #
 
 #
diff --git a/bin/hardening/2.6.1_var_tmp_partition.sh b/bin/hardening/2.6.1_var_tmp_partition.sh
index a4c15c7..d783b33 100755
--- a/bin/hardening/2.6.1_var_tmp_partition.sh
+++ b/bin/hardening/2.6.1_var_tmp_partition.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 
 #
-# CIS Debian 7 Hardening
+# CIS Debian 7/8 Hardening
 #
 
 #
diff --git a/bin/hardening/2.6.2_var_tmp_nodev.sh b/bin/hardening/2.6.2_var_tmp_nodev.sh
index ebafeb0..017b739 100755
--- a/bin/hardening/2.6.2_var_tmp_nodev.sh
+++ b/bin/hardening/2.6.2_var_tmp_nodev.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 
 #
-# CIS Debian 7 Hardening
+# CIS Debian 7/8 Hardening
 #
 
 #
diff --git a/bin/hardening/2.6.3_var_tmp_nosuid.sh b/bin/hardening/2.6.3_var_tmp_nosuid.sh
index a78a72c..bb45e36 100755
--- a/bin/hardening/2.6.3_var_tmp_nosuid.sh
+++ b/bin/hardening/2.6.3_var_tmp_nosuid.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 
 #
-# CIS Debian 7 Hardening
+# CIS Debian 7/8 Hardening
 #
 
 #
diff --git a/bin/hardening/2.6.4_var_tmp_noexec.sh b/bin/hardening/2.6.4_var_tmp_noexec.sh
index 17242ca..5e3ffd5 100755
--- a/bin/hardening/2.6.4_var_tmp_noexec.sh
+++ b/bin/hardening/2.6.4_var_tmp_noexec.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 
 #
-# CIS Debian 7 Hardening
+# CIS Debian 7/8 Hardening
 #
 
 #
diff --git a/bin/hardening/2.7_var_log_partition.sh b/bin/hardening/2.7_var_log_partition.sh
index c6a7e37..b03dd80 100755
--- a/bin/hardening/2.7_var_log_partition.sh
+++ b/bin/hardening/2.7_var_log_partition.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 
 #
-# CIS Debian 7 Hardening
+# CIS Debian 7/8 Hardening
 #
 
 #
diff --git a/bin/hardening/2.8_var_log_audit_partition.sh b/bin/hardening/2.8_var_log_audit_partition.sh
index 8e20d06..8019643 100755
--- a/bin/hardening/2.8_var_log_audit_partition.sh
+++ b/bin/hardening/2.8_var_log_audit_partition.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 
 #
-# CIS Debian 7 Hardening
+# CIS Debian 7/8 Hardening
 #
 
 #
diff --git a/bin/hardening/2.9_home_partition.sh b/bin/hardening/2.9_home_partition.sh
index ed0dedf..df421da 100755
--- a/bin/hardening/2.9_home_partition.sh
+++ b/bin/hardening/2.9_home_partition.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 
 #
-# CIS Debian 7 Hardening
+# CIS Debian 7/8 Hardening
 #
 
 #
diff --git a/bin/hardening/3.1_bootloader_ownership.sh b/bin/hardening/3.1_bootloader_ownership.sh
index 9f9a3a2..d6c8fe4 100755
--- a/bin/hardening/3.1_bootloader_ownership.sh
+++ b/bin/hardening/3.1_bootloader_ownership.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 
 #
-# CIS Debian 7 Hardening
+# CIS Debian 7/8 Hardening
 #
 
 #
diff --git a/bin/hardening/3.2_bootloader_permissions.sh b/bin/hardening/3.2_bootloader_permissions.sh
index d55609e..4c48ac5 100755
--- a/bin/hardening/3.2_bootloader_permissions.sh
+++ b/bin/hardening/3.2_bootloader_permissions.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 
 #
-# CIS Debian 7 Hardening
+# CIS Debian 7/8 Hardening
 #
 
 #
diff --git a/bin/hardening/3.3_bootloader_password.sh b/bin/hardening/3.3_bootloader_password.sh
index ba17945..e838069 100755
--- a/bin/hardening/3.3_bootloader_password.sh
+++ b/bin/hardening/3.3_bootloader_password.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 
 #
-# CIS Debian 7 Hardening
+# CIS Debian 7/8 Hardening
 #
 
 #
diff --git a/bin/hardening/3.4_root_password.sh b/bin/hardening/3.4_root_password.sh
index d00be4c..cfca867 100755
--- a/bin/hardening/3.4_root_password.sh
+++ b/bin/hardening/3.4_root_password.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 
 #
-# CIS Debian 7 Hardening
+# CIS Debian 7/8 Hardening
 #
 
 #
diff --git a/bin/hardening/4.1_restrict_core_dumps.sh b/bin/hardening/4.1_restrict_core_dumps.sh
index 9f57b49..6f51aa3 100755
--- a/bin/hardening/4.1_restrict_core_dumps.sh
+++ b/bin/hardening/4.1_restrict_core_dumps.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 
 #
-# CIS Debian 7 Hardening
+# CIS Debian 7/8 Hardening
 #
 
 #
diff --git a/bin/hardening/4.2_enable_nx_support.sh b/bin/hardening/4.2_enable_nx_support.sh
index 42f76c9..00c7d62 100755
--- a/bin/hardening/4.2_enable_nx_support.sh
+++ b/bin/hardening/4.2_enable_nx_support.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 
 #
-# CIS Debian 7 Hardening
+# CIS Debian 7/8 Hardening
 #
 
 #
diff --git a/bin/hardening/4.3_enable_randomized_vm_placement.sh b/bin/hardening/4.3_enable_randomized_vm_placement.sh
index a695ab8..7b27c01 100755
--- a/bin/hardening/4.3_enable_randomized_vm_placement.sh
+++ b/bin/hardening/4.3_enable_randomized_vm_placement.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 
 #
-# CIS Debian 7 Hardening
+# CIS Debian 7/8 Hardening
 #
 
 #
diff --git a/bin/hardening/4.4_disable_prelink.sh b/bin/hardening/4.4_disable_prelink.sh
index 1d9b596..b0af47a 100755
--- a/bin/hardening/4.4_disable_prelink.sh
+++ b/bin/hardening/4.4_disable_prelink.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 
 #
-# CIS Debian 7 Hardening
+# CIS Debian 7/8 Hardening
 #
 
 #
diff --git a/bin/hardening/4.5_enable_apparmor.sh b/bin/hardening/4.5_enable_apparmor.sh
index 1fcb438..d223209 100755
--- a/bin/hardening/4.5_enable_apparmor.sh
+++ b/bin/hardening/4.5_enable_apparmor.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 
 #
-# CIS Debian 7 Hardening
+# CIS Debian 7/8 Hardening
 #
 
 #
diff --git a/bin/hardening/5.1.1_disable_nis.sh b/bin/hardening/5.1.1_disable_nis.sh
index ae0a09f..508914a 100755
--- a/bin/hardening/5.1.1_disable_nis.sh
+++ b/bin/hardening/5.1.1_disable_nis.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 
 #
-# CIS Debian 7 Hardening
+# CIS Debian 7/8 Hardening
 #
 
 #
diff --git a/bin/hardening/5.1.2_disable_rsh.sh b/bin/hardening/5.1.2_disable_rsh.sh
index d767a7f..d4bb319 100755
--- a/bin/hardening/5.1.2_disable_rsh.sh
+++ b/bin/hardening/5.1.2_disable_rsh.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 
 #
-# CIS Debian 7 Hardening
+# CIS Debian 7/8 Hardening
 #
 
 #
diff --git a/bin/hardening/5.1.3_disable_rsh_client.sh b/bin/hardening/5.1.3_disable_rsh_client.sh
index 43421ac..e23819d 100755
--- a/bin/hardening/5.1.3_disable_rsh_client.sh
+++ b/bin/hardening/5.1.3_disable_rsh_client.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 
 #
-# CIS Debian 7 Hardening
+# CIS Debian 7/8 Hardening
 #
 
 #
diff --git a/bin/hardening/5.1.4_disable_talk.sh b/bin/hardening/5.1.4_disable_talk.sh
index a741ae2..ff0e07f 100755
--- a/bin/hardening/5.1.4_disable_talk.sh
+++ b/bin/hardening/5.1.4_disable_talk.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 
 #
-# CIS Debian 7 Hardening
+# CIS Debian 7/8 Hardening
 #
 
 #
diff --git a/bin/hardening/5.1.5_disable_talk_client.sh b/bin/hardening/5.1.5_disable_talk_client.sh
index ec40852..c84bc93 100755
--- a/bin/hardening/5.1.5_disable_talk_client.sh
+++ b/bin/hardening/5.1.5_disable_talk_client.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 
 #
-# CIS Debian 7 Hardening
+# CIS Debian 7/8 Hardening
 #
 
 #
diff --git a/bin/hardening/5.1.6_disable_telnet_server.sh b/bin/hardening/5.1.6_disable_telnet_server.sh
index 40a7d65..a7f17f5 100755
--- a/bin/hardening/5.1.6_disable_telnet_server.sh
+++ b/bin/hardening/5.1.6_disable_telnet_server.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 
 #
-# CIS Debian 7 Hardening
+# CIS Debian 7/8 Hardening
 #
 
 #
diff --git a/bin/hardening/5.1.7_disable_tftp_server.sh b/bin/hardening/5.1.7_disable_tftp_server.sh
index 456a759..28c1162 100755
--- a/bin/hardening/5.1.7_disable_tftp_server.sh
+++ b/bin/hardening/5.1.7_disable_tftp_server.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 
 #
-# CIS Debian 7 Hardening
+# CIS Debian 7/8 Hardening
 #
 
 #
diff --git a/bin/hardening/5.1.8_disable_inetd.sh b/bin/hardening/5.1.8_disable_inetd.sh
index 76c9c59..6df8a32 100755
--- a/bin/hardening/5.1.8_disable_inetd.sh
+++ b/bin/hardening/5.1.8_disable_inetd.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 
 #
-# CIS Debian 7 Hardening
+# CIS Debian 7/8 Hardening
 #
 
 #
diff --git a/bin/hardening/5.2_disable_chargen.sh b/bin/hardening/5.2_disable_chargen.sh
index 8f07b09..9da1ae5 100755
--- a/bin/hardening/5.2_disable_chargen.sh
+++ b/bin/hardening/5.2_disable_chargen.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 
 #
-# CIS Debian 7 Hardening
+# CIS Debian 7/8 Hardening
 #
 
 #
diff --git a/bin/hardening/5.3_disable_daytime.sh b/bin/hardening/5.3_disable_daytime.sh
index c62a8e6..d5e0d8c 100755
--- a/bin/hardening/5.3_disable_daytime.sh
+++ b/bin/hardening/5.3_disable_daytime.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 
 #
-# CIS Debian 7 Hardening
+# CIS Debian 7/8 Hardening
 #
 
 #
diff --git a/bin/hardening/5.4_disable_echo.sh b/bin/hardening/5.4_disable_echo.sh
index 0e61c25..f2b0090 100755
--- a/bin/hardening/5.4_disable_echo.sh
+++ b/bin/hardening/5.4_disable_echo.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 
 #
-# CIS Debian 7 Hardening
+# CIS Debian 7/8 Hardening
 #
 
 #
diff --git a/bin/hardening/5.5_disable_discard.sh b/bin/hardening/5.5_disable_discard.sh
index 731670b..9b2076c 100755
--- a/bin/hardening/5.5_disable_discard.sh
+++ b/bin/hardening/5.5_disable_discard.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 
 #
-# CIS Debian 7 Hardening
+# CIS Debian 7/8 Hardening
 #
 
 #
diff --git a/bin/hardening/5.6_disable_time.sh b/bin/hardening/5.6_disable_time.sh
index 862c819..5e0b6fc 100755
--- a/bin/hardening/5.6_disable_time.sh
+++ b/bin/hardening/5.6_disable_time.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 
 #
-# CIS Debian 7 Hardening
+# CIS Debian 7/8 Hardening
 #
 
 #
diff --git a/bin/hardening/6.10_disable_http_server.sh b/bin/hardening/6.10_disable_http_server.sh
index 3ba1d34..8650019 100755
--- a/bin/hardening/6.10_disable_http_server.sh
+++ b/bin/hardening/6.10_disable_http_server.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 
 #
-# CIS Debian 7 Hardening
+# CIS Debian 7/8 Hardening
 #
 
 #
diff --git a/bin/hardening/6.11_disable_imap_pop.sh b/bin/hardening/6.11_disable_imap_pop.sh
index ad5425d..c796ebe 100755
--- a/bin/hardening/6.11_disable_imap_pop.sh
+++ b/bin/hardening/6.11_disable_imap_pop.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 
 #
-# CIS Debian 7 Hardening
+# CIS Debian 7/8 Hardening
 #
 
 #
diff --git a/bin/hardening/6.12_disable_samba.sh b/bin/hardening/6.12_disable_samba.sh
index 7c480be..60310bd 100755
--- a/bin/hardening/6.12_disable_samba.sh
+++ b/bin/hardening/6.12_disable_samba.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 
 #
-# CIS Debian 7 Hardening
+# CIS Debian 7/8 Hardening
 #
 
 #
diff --git a/bin/hardening/6.13_disable_http_proxy.sh b/bin/hardening/6.13_disable_http_proxy.sh
index cc50464..6765032 100755
--- a/bin/hardening/6.13_disable_http_proxy.sh
+++ b/bin/hardening/6.13_disable_http_proxy.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 
 #
-# CIS Debian 7 Hardening
+# CIS Debian 7/8 Hardening
 #
 
 #
diff --git a/bin/hardening/6.14_disable_snmp_server.sh b/bin/hardening/6.14_disable_snmp_server.sh
index 91c66bf..78ec3a6 100755
--- a/bin/hardening/6.14_disable_snmp_server.sh
+++ b/bin/hardening/6.14_disable_snmp_server.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 
 #
-# CIS Debian 7 Hardening
+# CIS Debian 7/8 Hardening
 #
 
 #
diff --git a/bin/hardening/6.15_mta_localhost.sh b/bin/hardening/6.15_mta_localhost.sh
index 13202f5..732bcf7 100755
--- a/bin/hardening/6.15_mta_localhost.sh
+++ b/bin/hardening/6.15_mta_localhost.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 
 #
-# CIS Debian 7 Hardening
+# CIS Debian 7/8 Hardening
 #
 
 #
diff --git a/bin/hardening/6.16_disable_rsync.sh b/bin/hardening/6.16_disable_rsync.sh
index f63e1a8..735d689 100755
--- a/bin/hardening/6.16_disable_rsync.sh
+++ b/bin/hardening/6.16_disable_rsync.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 
 #
-# CIS Debian 7 Hardening
+# CIS Debian 7/8 Hardening
 #
 
 #
diff --git a/bin/hardening/6.1_disable_xwindow_system.sh b/bin/hardening/6.1_disable_xwindow_system.sh
index c642c0a..28a1e47 100755
--- a/bin/hardening/6.1_disable_xwindow_system.sh
+++ b/bin/hardening/6.1_disable_xwindow_system.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 
 #
-# CIS Debian 7 Hardening
+# CIS Debian 7/8 Hardening
 #
 
 #
diff --git a/bin/hardening/6.2_disable_avahi_server.sh b/bin/hardening/6.2_disable_avahi_server.sh
index b04368e..23d7859 100755
--- a/bin/hardening/6.2_disable_avahi_server.sh
+++ b/bin/hardening/6.2_disable_avahi_server.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 
 #
-# CIS Debian 7 Hardening
+# CIS Debian 7/8 Hardening
 #
 
 #
diff --git a/bin/hardening/6.3_disable_print_server.sh b/bin/hardening/6.3_disable_print_server.sh
index 031bb32..340d7e5 100755
--- a/bin/hardening/6.3_disable_print_server.sh
+++ b/bin/hardening/6.3_disable_print_server.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 
 #
-# CIS Debian 7 Hardening
+# CIS Debian 7/8 Hardening
 #
 
 #
diff --git a/bin/hardening/6.4_disable_dhcp.sh b/bin/hardening/6.4_disable_dhcp.sh
index 4f5ab4c..5092b72 100755
--- a/bin/hardening/6.4_disable_dhcp.sh
+++ b/bin/hardening/6.4_disable_dhcp.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 
 #
-# CIS Debian 7 Hardening
+# CIS Debian 7/8 Hardening
 #
 
 #
diff --git a/bin/hardening/6.5_configure_ntp.sh b/bin/hardening/6.5_configure_ntp.sh
index aceca2b..8f18af6 100755
--- a/bin/hardening/6.5_configure_ntp.sh
+++ b/bin/hardening/6.5_configure_ntp.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 
 #
-# CIS Debian 7 Hardening
+# CIS Debian 7/8 Hardening
 #
 
 #
diff --git a/bin/hardening/6.6_disable_ldap.sh b/bin/hardening/6.6_disable_ldap.sh
index d7b6b07..06faa63 100755
--- a/bin/hardening/6.6_disable_ldap.sh
+++ b/bin/hardening/6.6_disable_ldap.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 
 #
-# CIS Debian 7 Hardening
+# CIS Debian 7/8 Hardening
 #
 
 #
diff --git a/bin/hardening/6.7_disable_nfs_rpc.sh b/bin/hardening/6.7_disable_nfs_rpc.sh
index 041bd6c..cf78f7d 100755
--- a/bin/hardening/6.7_disable_nfs_rpc.sh
+++ b/bin/hardening/6.7_disable_nfs_rpc.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 
 #
-# CIS Debian 7 Hardening
+# CIS Debian 7/8 Hardening
 #
 
 #
diff --git a/bin/hardening/6.8_disable_dns_server.sh b/bin/hardening/6.8_disable_dns_server.sh
index eef5504..15f00aa 100755
--- a/bin/hardening/6.8_disable_dns_server.sh
+++ b/bin/hardening/6.8_disable_dns_server.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 
 #
-# CIS Debian 7 Hardening
+# CIS Debian 7/8 Hardening
 #
 
 #
diff --git a/bin/hardening/6.9_disable_ftp.sh b/bin/hardening/6.9_disable_ftp.sh
index 72cecd8..f8159b2 100755
--- a/bin/hardening/6.9_disable_ftp.sh
+++ b/bin/hardening/6.9_disable_ftp.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 
 #
-# CIS Debian 7 Hardening
+# CIS Debian 7/8 Hardening
 #
 
 #
diff --git a/bin/hardening/7.1.1_disable_ip_forwarding.sh b/bin/hardening/7.1.1_disable_ip_forwarding.sh
index 0dc8bb5..e0c5248 100755
--- a/bin/hardening/7.1.1_disable_ip_forwarding.sh
+++ b/bin/hardening/7.1.1_disable_ip_forwarding.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 
 #
-# CIS Debian 7 Hardening
+# CIS Debian 7/8 Hardening
 #
 
 #
diff --git a/bin/hardening/7.1.2_disable_send_packet_redirects.sh b/bin/hardening/7.1.2_disable_send_packet_redirects.sh
index eb06f79..511eb13 100755
--- a/bin/hardening/7.1.2_disable_send_packet_redirects.sh
+++ b/bin/hardening/7.1.2_disable_send_packet_redirects.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 
 #
-# CIS Debian 7 Hardening
+# CIS Debian 7/8 Hardening
 #
 
 #
diff --git a/bin/hardening/7.2.1_disable_source_routed_packets.sh b/bin/hardening/7.2.1_disable_source_routed_packets.sh
index 94f604a..b527449 100755
--- a/bin/hardening/7.2.1_disable_source_routed_packets.sh
+++ b/bin/hardening/7.2.1_disable_source_routed_packets.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 
 #
-# CIS Debian 7 Hardening
+# CIS Debian 7/8 Hardening
 #
 
 #
diff --git a/bin/hardening/7.2.2_disable_icmp_redirect.sh b/bin/hardening/7.2.2_disable_icmp_redirect.sh
index 0d1b789..c191211 100755
--- a/bin/hardening/7.2.2_disable_icmp_redirect.sh
+++ b/bin/hardening/7.2.2_disable_icmp_redirect.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 
 #
-# CIS Debian 7 Hardening
+# CIS Debian 7/8 Hardening
 #
 
 #
diff --git a/bin/hardening/7.2.3_disable_secure_icmp_redirect.sh b/bin/hardening/7.2.3_disable_secure_icmp_redirect.sh
index dafc2fb..aa684f4 100755
--- a/bin/hardening/7.2.3_disable_secure_icmp_redirect.sh
+++ b/bin/hardening/7.2.3_disable_secure_icmp_redirect.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 
 #
-# CIS Debian 7 Hardening
+# CIS Debian 7/8 Hardening
 #
 
 #
diff --git a/bin/hardening/7.2.4_log_martian_packets.sh b/bin/hardening/7.2.4_log_martian_packets.sh
index a0037f1..30880b4 100755
--- a/bin/hardening/7.2.4_log_martian_packets.sh
+++ b/bin/hardening/7.2.4_log_martian_packets.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 
 #
-# CIS Debian 7 Hardening
+# CIS Debian 7/8 Hardening
 #
 
 #
diff --git a/bin/hardening/7.2.5_ignore_broadcast_requests.sh b/bin/hardening/7.2.5_ignore_broadcast_requests.sh
index b3c260c..9422dbb 100755
--- a/bin/hardening/7.2.5_ignore_broadcast_requests.sh
+++ b/bin/hardening/7.2.5_ignore_broadcast_requests.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 
 #
-# CIS Debian 7 Hardening
+# CIS Debian 7/8 Hardening
 #
 
 #
diff --git a/bin/hardening/7.2.6_enable_bad_error_message_protection.sh b/bin/hardening/7.2.6_enable_bad_error_message_protection.sh
index c4864dc..ad7ddcc 100755
--- a/bin/hardening/7.2.6_enable_bad_error_message_protection.sh
+++ b/bin/hardening/7.2.6_enable_bad_error_message_protection.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 
 #
-# CIS Debian 7 Hardening
+# CIS Debian 7/8 Hardening
 #
 
 #
diff --git a/bin/hardening/7.2.7_enable_source_route_validation.sh b/bin/hardening/7.2.7_enable_source_route_validation.sh
index 82ee333..8710e4a 100755
--- a/bin/hardening/7.2.7_enable_source_route_validation.sh
+++ b/bin/hardening/7.2.7_enable_source_route_validation.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 
 #
-# CIS Debian 7 Hardening
+# CIS Debian 7/8 Hardening
 #
 
 #
diff --git a/bin/hardening/7.2.8_enable_tcp_syn_cookies.sh b/bin/hardening/7.2.8_enable_tcp_syn_cookies.sh
index 7fa8aad..ed4ec2e 100755
--- a/bin/hardening/7.2.8_enable_tcp_syn_cookies.sh
+++ b/bin/hardening/7.2.8_enable_tcp_syn_cookies.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 
 #
-# CIS Debian 7 Hardening
+# CIS Debian 7/8 Hardening
 #
 
 #
diff --git a/bin/hardening/7.3.1_disable_ipv6_router_advertisement.sh b/bin/hardening/7.3.1_disable_ipv6_router_advertisement.sh
index bdc47f0..4a26a96 100755
--- a/bin/hardening/7.3.1_disable_ipv6_router_advertisement.sh
+++ b/bin/hardening/7.3.1_disable_ipv6_router_advertisement.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 
 #
-# CIS Debian 7 Hardening
+# CIS Debian 7/8 Hardening
 #
 
 #
diff --git a/bin/hardening/7.3.2_disable_ipv6_redirect.sh b/bin/hardening/7.3.2_disable_ipv6_redirect.sh
index 7f1252f..d45c39a 100755
--- a/bin/hardening/7.3.2_disable_ipv6_redirect.sh
+++ b/bin/hardening/7.3.2_disable_ipv6_redirect.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 
 #
-# CIS Debian 7 Hardening
+# CIS Debian 7/8 Hardening
 #
 
 #
diff --git a/bin/hardening/7.3.3_disable_ipv6.sh b/bin/hardening/7.3.3_disable_ipv6.sh
index 9557e49..03206d2 100755
--- a/bin/hardening/7.3.3_disable_ipv6.sh
+++ b/bin/hardening/7.3.3_disable_ipv6.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 
 #
-# CIS Debian 7 Hardening
+# CIS Debian 7/8 Hardening
 #
 
 #
diff --git a/bin/hardening/7.4.1_install_tcp_wrapper.sh b/bin/hardening/7.4.1_install_tcp_wrapper.sh
index 2e05824..33177bc 100755
--- a/bin/hardening/7.4.1_install_tcp_wrapper.sh
+++ b/bin/hardening/7.4.1_install_tcp_wrapper.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 
 #
-# CIS Debian 7 Hardening
+# CIS Debian 7/8 Hardening
 #
 
 #
diff --git a/bin/hardening/7.4.2_hosts_allow.sh b/bin/hardening/7.4.2_hosts_allow.sh
index 8e944ba..9fd3ae7 100755
--- a/bin/hardening/7.4.2_hosts_allow.sh
+++ b/bin/hardening/7.4.2_hosts_allow.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 
 #
-# CIS Debian 7 Hardening
+# CIS Debian 7/8 Hardening
 #
 
 #
diff --git a/bin/hardening/7.4.3_hosts_allow_permissions.sh b/bin/hardening/7.4.3_hosts_allow_permissions.sh
index 9d10f2c..8eca275 100755
--- a/bin/hardening/7.4.3_hosts_allow_permissions.sh
+++ b/bin/hardening/7.4.3_hosts_allow_permissions.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 
 #
-# CIS Debian 7 Hardening
+# CIS Debian 7/8 Hardening
 #
 
 #
diff --git a/bin/hardening/7.4.4_hosts_deny.sh b/bin/hardening/7.4.4_hosts_deny.sh
index b91f67e..91f074d 100755
--- a/bin/hardening/7.4.4_hosts_deny.sh
+++ b/bin/hardening/7.4.4_hosts_deny.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 
 #
-# CIS Debian 7 Hardening
+# CIS Debian 7/8 Hardening
 #
 
 #
diff --git a/bin/hardening/7.4.5_hosts_deny_permissions.sh b/bin/hardening/7.4.5_hosts_deny_permissions.sh
index d2d45dd..118803d 100755
--- a/bin/hardening/7.4.5_hosts_deny_permissions.sh
+++ b/bin/hardening/7.4.5_hosts_deny_permissions.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 
 #
-# CIS Debian 7 Hardening
+# CIS Debian 7/8 Hardening
 #
 
 #
diff --git a/bin/hardening/7.5.1_disable_dccp.sh b/bin/hardening/7.5.1_disable_dccp.sh
index deb690b..283c430 100755
--- a/bin/hardening/7.5.1_disable_dccp.sh
+++ b/bin/hardening/7.5.1_disable_dccp.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 
 #
-# CIS Debian 7 Hardening
+# CIS Debian 7/8 Hardening
 #
 
 #
diff --git a/bin/hardening/7.5.2_disable_sctp.sh b/bin/hardening/7.5.2_disable_sctp.sh
index 817f726..3de599b 100755
--- a/bin/hardening/7.5.2_disable_sctp.sh
+++ b/bin/hardening/7.5.2_disable_sctp.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 
 #
-# CIS Debian 7 Hardening
+# CIS Debian 7/8 Hardening
 #
 
 #
diff --git a/bin/hardening/7.5.3_disable_rds.sh b/bin/hardening/7.5.3_disable_rds.sh
index 4e6ebe2..50876d2 100755
--- a/bin/hardening/7.5.3_disable_rds.sh
+++ b/bin/hardening/7.5.3_disable_rds.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 
 #
-# CIS Debian 7 Hardening
+# CIS Debian 7/8 Hardening
 #
 
 #
diff --git a/bin/hardening/7.5.4_disable_tipc.sh b/bin/hardening/7.5.4_disable_tipc.sh
index 963f040..89ea080 100755
--- a/bin/hardening/7.5.4_disable_tipc.sh
+++ b/bin/hardening/7.5.4_disable_tipc.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 
 #
-# CIS Debian 7 Hardening
+# CIS Debian 7/8 Hardening
 #
 
 #
diff --git a/bin/hardening/7.6_disable_wireless.sh b/bin/hardening/7.6_disable_wireless.sh
index def2d34..785a14f 100755
--- a/bin/hardening/7.6_disable_wireless.sh
+++ b/bin/hardening/7.6_disable_wireless.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 
 #
-# CIS Debian 7 Hardening
+# CIS Debian 7/8 Hardening
 #
 
 #
diff --git a/bin/hardening/7.7_enable_firewall.sh b/bin/hardening/7.7_enable_firewall.sh
index 5f4d754..ac27ecc 100755
--- a/bin/hardening/7.7_enable_firewall.sh
+++ b/bin/hardening/7.7_enable_firewall.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 
 #
-# CIS Debian 7 Hardening
+# CIS Debian 7/8 Hardening
 #
 
 #
diff --git a/bin/hardening/8.0_enable_auditd_kernel.sh b/bin/hardening/8.0_enable_auditd_kernel.sh
index 907fe48..8daed6b 100755
--- a/bin/hardening/8.0_enable_auditd_kernel.sh
+++ b/bin/hardening/8.0_enable_auditd_kernel.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 
 #
-# CIS Debian 7 Hardening
+# CIS Debian 7/8 Hardening
 #
 
 #
diff --git a/bin/hardening/8.1.1.1_audit_log_storage.sh b/bin/hardening/8.1.1.1_audit_log_storage.sh
index b452e85..6b4515e 100755
--- a/bin/hardening/8.1.1.1_audit_log_storage.sh
+++ b/bin/hardening/8.1.1.1_audit_log_storage.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 
 #
-# CIS Debian 7 Hardening
+# CIS Debian 7/8 Hardening
 #
 
 #
diff --git a/bin/hardening/8.1.1.2_halt_when_audit_log_full.sh b/bin/hardening/8.1.1.2_halt_when_audit_log_full.sh
index 4dda28b..9149943 100755
--- a/bin/hardening/8.1.1.2_halt_when_audit_log_full.sh
+++ b/bin/hardening/8.1.1.2_halt_when_audit_log_full.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 
 #
-# CIS Debian 7 Hardening
+# CIS Debian 7/8 Hardening
 #
 
 #
diff --git a/bin/hardening/8.1.1.3_keep_all_audit_logs.sh b/bin/hardening/8.1.1.3_keep_all_audit_logs.sh
index 94521da..6af3101 100755
--- a/bin/hardening/8.1.1.3_keep_all_audit_logs.sh
+++ b/bin/hardening/8.1.1.3_keep_all_audit_logs.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 
 #
-# CIS Debian 7 Hardening
+# CIS Debian 7/8 Hardening
 #
 
 #
diff --git a/bin/hardening/8.1.10_record_dac_edit.sh b/bin/hardening/8.1.10_record_dac_edit.sh
index 000abad..d63e8ac 100755
--- a/bin/hardening/8.1.10_record_dac_edit.sh
+++ b/bin/hardening/8.1.10_record_dac_edit.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 
 #
-# CIS Debian 7 Hardening
+# CIS Debian 7/8 Hardening
 #
 
 #
diff --git a/bin/hardening/8.1.11_record_failed_access_file.sh b/bin/hardening/8.1.11_record_failed_access_file.sh
index a0ab3bf..458e26e 100755
--- a/bin/hardening/8.1.11_record_failed_access_file.sh
+++ b/bin/hardening/8.1.11_record_failed_access_file.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 
 #
-# CIS Debian 7 Hardening
+# CIS Debian 7/8 Hardening
 #
 
 #
diff --git a/bin/hardening/8.1.12_record_privileged_commands.sh b/bin/hardening/8.1.12_record_privileged_commands.sh
index 804eff0..d1a042a 100755
--- a/bin/hardening/8.1.12_record_privileged_commands.sh
+++ b/bin/hardening/8.1.12_record_privileged_commands.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 
 #
-# CIS Debian 7 Hardening
+# CIS Debian 7/8 Hardening
 #
 
 #
diff --git a/bin/hardening/8.1.13_record_successful_mount.sh b/bin/hardening/8.1.13_record_successful_mount.sh
index cf2d7ae..c3e4ff7 100755
--- a/bin/hardening/8.1.13_record_successful_mount.sh
+++ b/bin/hardening/8.1.13_record_successful_mount.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 
 #
-# CIS Debian 7 Hardening
+# CIS Debian 7/8 Hardening
 #
 
 #
diff --git a/bin/hardening/8.1.14_record_file_deletions.sh b/bin/hardening/8.1.14_record_file_deletions.sh
index f3012d7..1488d99 100755
--- a/bin/hardening/8.1.14_record_file_deletions.sh
+++ b/bin/hardening/8.1.14_record_file_deletions.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 
 #
-# CIS Debian 7 Hardening
+# CIS Debian 7/8 Hardening
 #
 
 #
diff --git a/bin/hardening/8.1.15_record_sudoers_edit.sh b/bin/hardening/8.1.15_record_sudoers_edit.sh
index 190b35e..f8740b3 100755
--- a/bin/hardening/8.1.15_record_sudoers_edit.sh
+++ b/bin/hardening/8.1.15_record_sudoers_edit.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 
 #
-# CIS Debian 7 Hardening
+# CIS Debian 7/8 Hardening
 #
 
 #
diff --git a/bin/hardening/8.1.16_record_sudo_usage.sh b/bin/hardening/8.1.16_record_sudo_usage.sh
index f98c75e..c164727 100755
--- a/bin/hardening/8.1.16_record_sudo_usage.sh
+++ b/bin/hardening/8.1.16_record_sudo_usage.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 
 #
-# CIS Debian 7 Hardening
+# CIS Debian 7/8 Hardening
 #
 
 #
diff --git a/bin/hardening/8.1.17_record_kernel_modules.sh b/bin/hardening/8.1.17_record_kernel_modules.sh
index 9b01400..2904209 100755
--- a/bin/hardening/8.1.17_record_kernel_modules.sh
+++ b/bin/hardening/8.1.17_record_kernel_modules.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 
 #
-# CIS Debian 7 Hardening
+# CIS Debian 7/8 Hardening
 #
 
 #
diff --git a/bin/hardening/8.1.18_freeze_auditd_conf.sh b/bin/hardening/8.1.18_freeze_auditd_conf.sh
index ce1686d..0a3df10 100755
--- a/bin/hardening/8.1.18_freeze_auditd_conf.sh
+++ b/bin/hardening/8.1.18_freeze_auditd_conf.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 
 #
-# CIS Debian 7 Hardening
+# CIS Debian 7/8 Hardening
 #
 
 #
diff --git a/bin/hardening/8.1.2_enable_auditd.sh b/bin/hardening/8.1.2_enable_auditd.sh
index 5ec1cf4..1c01bf9 100755
--- a/bin/hardening/8.1.2_enable_auditd.sh
+++ b/bin/hardening/8.1.2_enable_auditd.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 
 #
-# CIS Debian 7 Hardening
+# CIS Debian 7/8 Hardening
 #
 
 #
diff --git a/bin/hardening/8.1.3_audit_bootloader.sh b/bin/hardening/8.1.3_audit_bootloader.sh
index b477718..b5a7518 100755
--- a/bin/hardening/8.1.3_audit_bootloader.sh
+++ b/bin/hardening/8.1.3_audit_bootloader.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 
 #
-# CIS Debian 7 Hardening
+# CIS Debian 7/8 Hardening
 #
 
 #
diff --git a/bin/hardening/8.1.4_record_date_time_edit.sh b/bin/hardening/8.1.4_record_date_time_edit.sh
index 0ca5c76..e5d62f9 100755
--- a/bin/hardening/8.1.4_record_date_time_edit.sh
+++ b/bin/hardening/8.1.4_record_date_time_edit.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 
 #
-# CIS Debian 7 Hardening
+# CIS Debian 7/8 Hardening
 #
 
 #
diff --git a/bin/hardening/8.1.5_record_user_group_edit.sh b/bin/hardening/8.1.5_record_user_group_edit.sh
index 7660c2d..ffbfea5 100755
--- a/bin/hardening/8.1.5_record_user_group_edit.sh
+++ b/bin/hardening/8.1.5_record_user_group_edit.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 
 #
-# CIS Debian 7 Hardening
+# CIS Debian 7/8 Hardening
 #
 
 #
diff --git a/bin/hardening/8.1.6_record_network_edit.sh b/bin/hardening/8.1.6_record_network_edit.sh
index ebf4bc2..e8d8a1d 100755
--- a/bin/hardening/8.1.6_record_network_edit.sh
+++ b/bin/hardening/8.1.6_record_network_edit.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 
 #
-# CIS Debian 7 Hardening
+# CIS Debian 7/8 Hardening
 #
 
 #
diff --git a/bin/hardening/8.1.7_record_mac_edit.sh b/bin/hardening/8.1.7_record_mac_edit.sh
index 7c9350b..9c194f5 100755
--- a/bin/hardening/8.1.7_record_mac_edit.sh
+++ b/bin/hardening/8.1.7_record_mac_edit.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 
 #
-# CIS Debian 7 Hardening
+# CIS Debian 7/8 Hardening
 #
 
 #
diff --git a/bin/hardening/8.1.8_record_login_logout.sh b/bin/hardening/8.1.8_record_login_logout.sh
index ed52837..95dea18 100755
--- a/bin/hardening/8.1.8_record_login_logout.sh
+++ b/bin/hardening/8.1.8_record_login_logout.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 
 #
-# CIS Debian 7 Hardening
+# CIS Debian 7/8 Hardening
 #
 
 #
diff --git a/bin/hardening/8.1.9_record_session_init.sh b/bin/hardening/8.1.9_record_session_init.sh
index 29a42b3..8fa6a01 100755
--- a/bin/hardening/8.1.9_record_session_init.sh
+++ b/bin/hardening/8.1.9_record_session_init.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 
 #
-# CIS Debian 7 Hardening
+# CIS Debian 7/8 Hardening
 #
 
 #
diff --git a/bin/hardening/8.2.1_install_syslog-ng.sh b/bin/hardening/8.2.1_install_syslog-ng.sh
index 0f5a630..53a4438 100755
--- a/bin/hardening/8.2.1_install_syslog-ng.sh
+++ b/bin/hardening/8.2.1_install_syslog-ng.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 
 #
-# CIS Debian 7 Hardening
+# CIS Debian 7/8 Hardening
 #
 
 #
diff --git a/bin/hardening/8.2.2_enable_syslog-ng.sh b/bin/hardening/8.2.2_enable_syslog-ng.sh
index 9c59f7e..b59170c 100755
--- a/bin/hardening/8.2.2_enable_syslog-ng.sh
+++ b/bin/hardening/8.2.2_enable_syslog-ng.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 
 #
-# CIS Debian 7 Hardening
+# CIS Debian 7/8 Hardening
 #
 
 #
diff --git a/bin/hardening/8.2.3_configure_syslog-ng.sh b/bin/hardening/8.2.3_configure_syslog-ng.sh
index 15745a0..f57561f 100755
--- a/bin/hardening/8.2.3_configure_syslog-ng.sh
+++ b/bin/hardening/8.2.3_configure_syslog-ng.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 
 #
-# CIS Debian 7 Hardening
+# CIS Debian 7/8 Hardening
 #
 
 #
diff --git a/bin/hardening/8.2.4_set_logfile_perm.sh b/bin/hardening/8.2.4_set_logfile_perm.sh
index b4c1aff..58453d1 100755
--- a/bin/hardening/8.2.4_set_logfile_perm.sh
+++ b/bin/hardening/8.2.4_set_logfile_perm.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 
 #
-# CIS Debian 7 Hardening
+# CIS Debian 7/8 Hardening
 #
 
 #
diff --git a/bin/hardening/8.2.5_syslog-ng_remote_host.sh b/bin/hardening/8.2.5_syslog-ng_remote_host.sh
index 8aeb628..7ce088d 100755
--- a/bin/hardening/8.2.5_syslog-ng_remote_host.sh
+++ b/bin/hardening/8.2.5_syslog-ng_remote_host.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 
 #
-# CIS Debian 7 Hardening
+# CIS Debian 7/8 Hardening
 #
 
 #
diff --git a/bin/hardening/8.2.6_remote_syslog-ng_acl.sh b/bin/hardening/8.2.6_remote_syslog-ng_acl.sh
index aaf01de..a14be18 100755
--- a/bin/hardening/8.2.6_remote_syslog-ng_acl.sh
+++ b/bin/hardening/8.2.6_remote_syslog-ng_acl.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 
 #
-# CIS Debian 7 Hardening
+# CIS Debian 7/8 Hardening
 #
 
 #
diff --git a/bin/hardening/8.3.1_install_tripwire.sh b/bin/hardening/8.3.1_install_tripwire.sh
index 67ca62e..3ee8266 100755
--- a/bin/hardening/8.3.1_install_tripwire.sh
+++ b/bin/hardening/8.3.1_install_tripwire.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 
 #
-# CIS Debian 7 Hardening
+# CIS Debian 7/8 Hardening
 #
 
 #
diff --git a/bin/hardening/8.3.2_tripwire_cron.sh b/bin/hardening/8.3.2_tripwire_cron.sh
index eeb9c49..5f23c87 100755
--- a/bin/hardening/8.3.2_tripwire_cron.sh
+++ b/bin/hardening/8.3.2_tripwire_cron.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 
 #
-# CIS Debian 7 Hardening
+# CIS Debian 7/8 Hardening
 #
 
 #
diff --git a/bin/hardening/8.4_configure_logrotate.sh b/bin/hardening/8.4_configure_logrotate.sh
index ea3a2cf..9da2150 100755
--- a/bin/hardening/8.4_configure_logrotate.sh
+++ b/bin/hardening/8.4_configure_logrotate.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 
 #
-# CIS Debian 7 Hardening
+# CIS Debian 7/8 Hardening
 #
 
 #
diff --git a/bin/hardening/9.1.1_enable_cron.sh b/bin/hardening/9.1.1_enable_cron.sh
index 05fa812..b8a3765 100755
--- a/bin/hardening/9.1.1_enable_cron.sh
+++ b/bin/hardening/9.1.1_enable_cron.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 
 #
-# CIS Debian 7 Hardening
+# CIS Debian 7/8 Hardening
 #
 
 #
diff --git a/bin/hardening/9.1.2_crontab_perm_ownership.sh b/bin/hardening/9.1.2_crontab_perm_ownership.sh
index ec101a2..89920b4 100755
--- a/bin/hardening/9.1.2_crontab_perm_ownership.sh
+++ b/bin/hardening/9.1.2_crontab_perm_ownership.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 
 #
-# CIS Debian 7 Hardening
+# CIS Debian 7/8 Hardening
 #
 
 #
diff --git a/bin/hardening/9.1.3_cron_hourly_perm_ownership.sh b/bin/hardening/9.1.3_cron_hourly_perm_ownership.sh
index a31a748..2be5456 100755
--- a/bin/hardening/9.1.3_cron_hourly_perm_ownership.sh
+++ b/bin/hardening/9.1.3_cron_hourly_perm_ownership.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 
 #
-# CIS Debian 7 Hardening
+# CIS Debian 7/8 Hardening
 #
 
 #
diff --git a/bin/hardening/9.1.4_cron_daily_perm_ownership.sh b/bin/hardening/9.1.4_cron_daily_perm_ownership.sh
index 8e85297..e9e7313 100755
--- a/bin/hardening/9.1.4_cron_daily_perm_ownership.sh
+++ b/bin/hardening/9.1.4_cron_daily_perm_ownership.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 
 #
-# CIS Debian 7 Hardening
+# CIS Debian 7/8 Hardening
 #
 
 #
diff --git a/bin/hardening/9.1.5_cron_weekly_perm_ownership.sh b/bin/hardening/9.1.5_cron_weekly_perm_ownership.sh
index 732935a..6c4fc91 100755
--- a/bin/hardening/9.1.5_cron_weekly_perm_ownership.sh
+++ b/bin/hardening/9.1.5_cron_weekly_perm_ownership.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 
 #
-# CIS Debian 7 Hardening
+# CIS Debian 7/8 Hardening
 #
 
 #
diff --git a/bin/hardening/9.1.6_cron_monthly_perm_ownership.sh b/bin/hardening/9.1.6_cron_monthly_perm_ownership.sh
index 1568433..596f7e8 100755
--- a/bin/hardening/9.1.6_cron_monthly_perm_ownership.sh
+++ b/bin/hardening/9.1.6_cron_monthly_perm_ownership.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 
 #
-# CIS Debian 7 Hardening
+# CIS Debian 7/8 Hardening
 #
 
 #
diff --git a/bin/hardening/9.1.7_cron_d_perm_ownership.sh b/bin/hardening/9.1.7_cron_d_perm_ownership.sh
index 3c8878a..d259c21 100755
--- a/bin/hardening/9.1.7_cron_d_perm_ownership.sh
+++ b/bin/hardening/9.1.7_cron_d_perm_ownership.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 
 #
-# CIS Debian 7 Hardening
+# CIS Debian 7/8 Hardening
 #
 
 #
diff --git a/bin/hardening/9.1.8_cron_users.sh b/bin/hardening/9.1.8_cron_users.sh
index 248ca75..27bd013 100755
--- a/bin/hardening/9.1.8_cron_users.sh
+++ b/bin/hardening/9.1.8_cron_users.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 
 #
-# CIS Debian 7 Hardening
+# CIS Debian 7/8 Hardening
 #
 
 #
diff --git a/bin/hardening/9.2.1_enable_cracklib.sh b/bin/hardening/9.2.1_enable_cracklib.sh
index b1caad3..0dfff17 100755
--- a/bin/hardening/9.2.1_enable_cracklib.sh
+++ b/bin/hardening/9.2.1_enable_cracklib.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 
 #
-# CIS Debian 7 Hardening
+# CIS Debian 7/8 Hardening
 #
 
 #
diff --git a/bin/hardening/9.2.2_enable_lockout_failed_password.sh b/bin/hardening/9.2.2_enable_lockout_failed_password.sh
index 2f7e70d..cb6bdd8 100755
--- a/bin/hardening/9.2.2_enable_lockout_failed_password.sh
+++ b/bin/hardening/9.2.2_enable_lockout_failed_password.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 
 #
-# CIS Debian 7 Hardening
+# CIS Debian 7/8 Hardening
 #
 
 #
diff --git a/bin/hardening/9.2.3_limit_password_reuse.sh b/bin/hardening/9.2.3_limit_password_reuse.sh
index f8bfa51..884b614 100755
--- a/bin/hardening/9.2.3_limit_password_reuse.sh
+++ b/bin/hardening/9.2.3_limit_password_reuse.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 
 #
-# CIS Debian 7 Hardening
+# CIS Debian 7/8 Hardening
 #
 
 #
diff --git a/bin/hardening/9.3.10_disable_sshd_setenv.sh b/bin/hardening/9.3.10_disable_sshd_setenv.sh
index 85c5da7..3cfe13e 100755
--- a/bin/hardening/9.3.10_disable_sshd_setenv.sh
+++ b/bin/hardening/9.3.10_disable_sshd_setenv.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 
 #
-# CIS Debian 7 Hardening
+# CIS Debian 7/8 Hardening
 #
 
 #
diff --git a/bin/hardening/9.3.11_sshd_ciphers.sh b/bin/hardening/9.3.11_sshd_ciphers.sh
index e7bd221..d05a84e 100755
--- a/bin/hardening/9.3.11_sshd_ciphers.sh
+++ b/bin/hardening/9.3.11_sshd_ciphers.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 
 #
-# CIS Debian 7 Hardening
+# CIS Debian 7/8 Hardening
 #
 
 #
diff --git a/bin/hardening/9.3.12_sshd_idle_timeout.sh b/bin/hardening/9.3.12_sshd_idle_timeout.sh
index a5c9a30..d00d934 100755
--- a/bin/hardening/9.3.12_sshd_idle_timeout.sh
+++ b/bin/hardening/9.3.12_sshd_idle_timeout.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 
 #
-# CIS Debian 7 Hardening
+# CIS Debian 7/8 Hardening
 #
 
 #
diff --git a/bin/hardening/9.3.13_sshd_limit_access.sh b/bin/hardening/9.3.13_sshd_limit_access.sh
index 91cae4a..6c7aa99 100755
--- a/bin/hardening/9.3.13_sshd_limit_access.sh
+++ b/bin/hardening/9.3.13_sshd_limit_access.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 
 #
-# CIS Debian 7 Hardening
+# CIS Debian 7/8 Hardening
 #
 
 #
diff --git a/bin/hardening/9.3.14_ssh_banner.sh b/bin/hardening/9.3.14_ssh_banner.sh
index 46e5278..54d4fc2 100755
--- a/bin/hardening/9.3.14_ssh_banner.sh
+++ b/bin/hardening/9.3.14_ssh_banner.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 
 #
-# CIS Debian 7 Hardening
+# CIS Debian 7/8 Hardening
 #
 
 #
diff --git a/bin/hardening/9.3.1_sshd_protocol.sh b/bin/hardening/9.3.1_sshd_protocol.sh
index 6dd85dc..58ffb3b 100755
--- a/bin/hardening/9.3.1_sshd_protocol.sh
+++ b/bin/hardening/9.3.1_sshd_protocol.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 
 #
-# CIS Debian 7 Hardening
+# CIS Debian 7/8 Hardening
 #
 
 #
diff --git a/bin/hardening/9.3.2_sshd_loglevel.sh b/bin/hardening/9.3.2_sshd_loglevel.sh
index eb7bb48..3630976 100755
--- a/bin/hardening/9.3.2_sshd_loglevel.sh
+++ b/bin/hardening/9.3.2_sshd_loglevel.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 
 #
-# CIS Debian 7 Hardening
+# CIS Debian 7/8 Hardening
 #
 
 #
diff --git a/bin/hardening/9.3.3_sshd_conf_perm_ownership.sh b/bin/hardening/9.3.3_sshd_conf_perm_ownership.sh
index 0e702a8..4e494ca 100755
--- a/bin/hardening/9.3.3_sshd_conf_perm_ownership.sh
+++ b/bin/hardening/9.3.3_sshd_conf_perm_ownership.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 
 #
-# CIS Debian 7 Hardening
+# CIS Debian 7/8 Hardening
 #
 
 #
diff --git a/bin/hardening/9.3.4_disable_x11_forwarding.sh b/bin/hardening/9.3.4_disable_x11_forwarding.sh
index c0857ef..ae0bac2 100755
--- a/bin/hardening/9.3.4_disable_x11_forwarding.sh
+++ b/bin/hardening/9.3.4_disable_x11_forwarding.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 
 #
-# CIS Debian 7 Hardening
+# CIS Debian 7/8 Hardening
 #
 
 #
diff --git a/bin/hardening/9.3.5_sshd_maxauthtries.sh b/bin/hardening/9.3.5_sshd_maxauthtries.sh
index 1780873..a1c97f1 100755
--- a/bin/hardening/9.3.5_sshd_maxauthtries.sh
+++ b/bin/hardening/9.3.5_sshd_maxauthtries.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 
 #
-# CIS Debian 7 Hardening
+# CIS Debian 7/8 Hardening
 #
 
 #
diff --git a/bin/hardening/9.3.6_enable_sshd_ignorerhosts.sh b/bin/hardening/9.3.6_enable_sshd_ignorerhosts.sh
index 030b581..4071c5d 100755
--- a/bin/hardening/9.3.6_enable_sshd_ignorerhosts.sh
+++ b/bin/hardening/9.3.6_enable_sshd_ignorerhosts.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 
 #
-# CIS Debian 7 Hardening
+# CIS Debian 7/8 Hardening
 #
 
 #
diff --git a/bin/hardening/9.3.7_disable_sshd_hostbasedauthentication.sh b/bin/hardening/9.3.7_disable_sshd_hostbasedauthentication.sh
index d3bcf0f..f9d56a3 100755
--- a/bin/hardening/9.3.7_disable_sshd_hostbasedauthentication.sh
+++ b/bin/hardening/9.3.7_disable_sshd_hostbasedauthentication.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 
 #
-# CIS Debian 7 Hardening
+# CIS Debian 7/8 Hardening
 #
 
 #
diff --git a/bin/hardening/9.3.8_disable_root_login.sh b/bin/hardening/9.3.8_disable_root_login.sh
index 22ab96b..310a7ed 100755
--- a/bin/hardening/9.3.8_disable_root_login.sh
+++ b/bin/hardening/9.3.8_disable_root_login.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 
 #
-# CIS Debian 7 Hardening
+# CIS Debian 7/8 Hardening
 #
 
 #
diff --git a/bin/hardening/9.3.9_disable_sshd_permitemptypasswords.sh b/bin/hardening/9.3.9_disable_sshd_permitemptypasswords.sh
index 94c6cc7..2de2de6 100755
--- a/bin/hardening/9.3.9_disable_sshd_permitemptypasswords.sh
+++ b/bin/hardening/9.3.9_disable_sshd_permitemptypasswords.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 
 #
-# CIS Debian 7 Hardening
+# CIS Debian 7/8 Hardening
 #
 
 #
diff --git a/bin/hardening/9.4_secure_tty.sh b/bin/hardening/9.4_secure_tty.sh
index f91700b..024c492 100755
--- a/bin/hardening/9.4_secure_tty.sh
+++ b/bin/hardening/9.4_secure_tty.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 
 #
-# CIS Debian 7 Hardening
+# CIS Debian 7/8 Hardening
 #
 
 #
diff --git a/bin/hardening/9.5_restrict_su.sh b/bin/hardening/9.5_restrict_su.sh
index 1b7d583..e4cf515 100755
--- a/bin/hardening/9.5_restrict_su.sh
+++ b/bin/hardening/9.5_restrict_su.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 
 #
-# CIS Debian 7 Hardening
+# CIS Debian 7/8 Hardening
 #
 
 #
diff --git a/bin/hardening/99.1_timeout_tty.sh b/bin/hardening/99.1_timeout_tty.sh
index 45d65d5..dacdfd3 100755
--- a/bin/hardening/99.1_timeout_tty.sh
+++ b/bin/hardening/99.1_timeout_tty.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 
 #
-# CIS Debian 7 Hardening /!\ Not in the Guide
+# CIS Debian 7/8 Hardening /!\ Not in the Guide
 #
 
 #
diff --git a/bin/hardening/99.2_disable_usb_devices.sh b/bin/hardening/99.2_disable_usb_devices.sh
index 32ea621..ca58eab 100755
--- a/bin/hardening/99.2_disable_usb_devices.sh
+++ b/bin/hardening/99.2_disable_usb_devices.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 
 #
-# CIS Debian 7 Hardening /!\ Not in the Guide
+# CIS Debian 7/8 Hardening /!\ Not in the Guide
 #
 
 #