diff --git a/.etckeeper b/.etckeeper
index 7c631003..6584d1a3 100755
--- a/.etckeeper
+++ b/.etckeeper
@@ -4212,6 +4212,7 @@ maybe chmod 0644 'sysctl.conf'
 maybe chmod 0755 'sysctl.d'
 maybe chmod 0644 'sysctl.d/50-IPv6.conf'
 maybe chmod 0644 'sysctl.d/99-nc-kernel.conf'
+maybe chmod 0644 'sysctl.d/9999-disable-core-dump.conf'
 maybe chmod 0644 'sysctl.d/README.sysctl'
 maybe chmod 0755 'systemd'
 maybe chmod 0644 'systemd/journald.conf'
diff --git a/login.defs b/login.defs
index db8baa4d..0ea3cb79 100644
--- a/login.defs
+++ b/login.defs
@@ -290,8 +290,8 @@ ENCRYPT_METHOD SHA512
 # If only one of the MIN or MAX values is set, then this value will be used.
 # If MIN > MAX, the highest value will be used.
 #
-# SHA_CRYPT_MIN_ROUNDS 5000
-# SHA_CRYPT_MAX_ROUNDS 5000
+SHA_CRYPT_MIN_ROUNDS 1001
+SHA_CRYPT_MAX_ROUNDS 3101
 
 ################# OBSOLETED BY PAM ##############
 #						#
diff --git a/security/limits.conf b/security/limits.conf
index 1aec6525..f9073bd5 100644
--- a/security/limits.conf
+++ b/security/limits.conf
@@ -43,7 +43,7 @@
 #<domain>      <type>  <item>         <value>
 #
 
-#*               soft    core            0
+	#*               soft    core            0
 #root            hard    core            100000
 #*               hard    rss             10000
 #@student        hard    nproc           20
@@ -52,5 +52,7 @@
 #ftp             hard    nproc           0
 #ftp             -       chroot          /ftp
 #@student        -       maxlogins       4
+*		hard	core	0
+*		soft	core	0
 
 # End of file
diff --git a/sysctl.d/9999-disable-core-dump.conf b/sysctl.d/9999-disable-core-dump.conf
new file mode 100644
index 00000000..296cbbe6
--- /dev/null
+++ b/sysctl.d/9999-disable-core-dump.conf
@@ -0,0 +1,2 @@
+#s.suid_dumpable=0
+kernel.core_pattern=|/bin/false