diff --git a/CHANGELOG.md b/CHANGELOG.md
index 9ae9a891..7c1b6569 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,10 @@
 master
 ===
 
+* `relative_assets` extension overrides local `relative: false` option to stylesheet/javascript tag helpers.
+
+# 4.0.0.rc.1
+
 * Removed ability to use JSON as frontmatter. Still allowed in data/ folder.
 * Added YAML data postscript. Like frontmatter, but reversed. Attach content after the key/value data as a `:postscript` key to the data structure (if Hash).
 
diff --git a/middleman-core/features/relative_assets.feature b/middleman-core/features/relative_assets.feature
index ac4d1776..e78f7665 100644
--- a/middleman-core/features/relative_assets.feature
+++ b/middleman-core/features/relative_assets.feature
@@ -59,15 +59,15 @@ Feature: Relative Assets
     When I cd to "build"
     Then the file "relative_image/index.html" should contain "../stylesheets/relative_assets.css"
 
-  Scenario: Rendering html with the feature enabled
+  Scenario: Rendering html with the feature enabled (overrides relative option on helpers)
     Given "relative_assets" feature is "enabled"
     And the Server is running at "relative-assets-app"
     When I go to "/relative_image.html"
     Then I should see '"stylesheets/relative_assets.css"'
     Then I should see '"javascripts/app.js"'
     When I go to "/relative_image_absolute_css.html"
-    Then I should see '"/stylesheets/relative_assets.css"'
-    Then I should see '"/javascripts/app.js"'
+    Then I should see '"stylesheets/relative_assets.css"'
+    Then I should see '"javascripts/app.js"'
     Then I should not see "/images/blank.gif"
     And I should see "images/blank.gif"
 
@@ -121,4 +121,4 @@ Feature: Relative Assets
       """
     And the Server is running at "relative-assets-app"
     When I go to "/sub/image_tag.html"
-    Then I should see '<img src="data:image/gif;base64,R0lGODlhAQABAIAAAAAAAP///yH5BAEAAAAALAAAAAABAAEAAAIBRAA7" />'
\ No newline at end of file
+    Then I should see '<img src="data:image/gif;base64,R0lGODlhAQABAIAAAAAAAP///yH5BAEAAAAALAAAAAABAAEAAAIBRAA7" />'