diff --git a/CHANGELOG.md b/CHANGELOG.md
index ddc497d3..2d960aee 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,7 +4,8 @@
 
 ### Changed
 * `space-before-function-paren` now uses `asyncArrow` option (eg. `async () => {}`)
-
+* `lines-around-directive` was deprecated in ESLint `v4.0.0`.
+* Enable `padding-line-between-statements` for directives
 ## [17.1.0] - 2017-09-19
 
 ### Added
diff --git a/lib/config/rules/stylistic-issues.js b/lib/config/rules/stylistic-issues.js
index 17b116c6..f4018ab8 100755
--- a/lib/config/rules/stylistic-issues.js
+++ b/lib/config/rules/stylistic-issues.js
@@ -59,8 +59,6 @@ module.exports = {
   'linebreak-style': 'off',
   // Enforces empty lines around comments
   'lines-around-comment': ['warn', {beforeBlockComment: true}],
-  // Require or disallow newlines around directives
-  'lines-around-directive': ['warn', 'always'],
   // Enforce position of line comments
   'line-comment-position': ['warn', {position: 'above'}],
   // Enforce a maximum file length
@@ -136,7 +134,11 @@ module.exports = {
   // Enforce padding within blocks
   'padded-blocks': 'off',
   // require or disallow padding lines between statements
-  'padding-line-between-statements': 'off',
+  'padding-line-between-statements': [
+    'error',
+    {blankLine: 'always', prev: 'directive', next: '*'},
+    {blankLine: 'any', prev: 'directive', next: 'directive'},
+  ],
   // Require quotes around object literal property names
   'quote-props': ['warn', 'as-needed'],
   // Specify whether backticks, double or single quotes should be used