diff --git a/CHANGELOG.md b/CHANGELOG.md
index 4b79a4d8b..65dbd38bb 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,18 @@
+* **Build !!!** (2015-!!-!!)
+  - **Upgraded framework to Laravel version 5**
+  - Renamed classes:
+  ```
+  October\Rain\Support\Yaml -> Yaml
+  October\Rain\Support\Markdown -> Markdown
+  System\Classes\ApplicationException -> ApplicationException
+  System\Classes\SystemException -> SystemException
+  October\Rain\Support\ValidationException -> ValidationException
+  ```
+  - Introduced a linking policy to control the way URLs are generated globally (see config cms.linkPolicy).
+
 * **Build 18x** (2015-01-xx)
   - Lists now support exporting to CSV format via the default **export** controller action.
+  - Platforms can *opt-in* for bleeding edge updates by enabling a config setting (`cms.edgeUpdates`), this helps perform testing before a stable version is deployed.
 
 * **Build 183** (2015-01-22)
   - Relation Controller now supports *has one* and *belongs to* relations (see Backend > Relations docs).
diff --git a/app/config/cms.php b/app/config/cms.php
index b792ce3d2..d23e7c4b7 100644
--- a/app/config/cms.php
+++ b/app/config/cms.php
@@ -49,6 +49,19 @@ return array(
 
     'disableCoreUpdates' => false,
 
+    /*
+    |--------------------------------------------------------------------------
+    | Bleeding edge updates
+    |--------------------------------------------------------------------------
+    |
+    | If you are developing with October, it is important to have the latest
+    | code base, set this value to 'true' to tell the platform to download
+    | and use the development copies of core files and plugins.
+    |
+    */
+
+    'edgeUpdates' => false,
+
     /*
     |--------------------------------------------------------------------------
     | Back-end URI prefix
@@ -206,4 +219,21 @@ return array(
 
     'convertLineEndings' => false,
 
+    /*
+    |--------------------------------------------------------------------------
+    | Linking policy
+    |--------------------------------------------------------------------------
+    |
+    | Controls how URL links are generated throughout the application.
+    |
+    | relative - relative to the application, schema and hostname is omitted
+    | detect   - detect hostname and use the current schema
+    | secure   - detect hostname and force HTTPS schema
+    | insecure - detect hostname and force HTTP schema
+    | force    - force hostname and schema using app.url config value
+    |
+    */
+
+    'linkPolicy' => 'relative',
+
 );