diff --git a/lib/jekyll/configuration.rb b/lib/jekyll/configuration.rb
index 5e923c27..442fa5e6 100644
--- a/lib/jekyll/configuration.rb
+++ b/lib/jekyll/configuration.rb
@@ -27,7 +27,7 @@ module Jekyll
       'pygments'      => true,
 
       'relative_permalinks' => true,     # backwards-compatibility with < 1.0
-                                         # will be set to false once 1.1 hits
+                                         # will be set to false once 2.0 hits
 
       'markdown'      => 'maruku',
       'permalink'     => 'date',
diff --git a/lib/jekyll/site.rb b/lib/jekyll/site.rb
index 3303f536..3b9699d2 100644
--- a/lib/jekyll/site.rb
+++ b/lib/jekyll/site.rb
@@ -394,7 +394,7 @@ module Jekyll
     def relative_permalinks_deprecation_method
       if config['relative_permalinks'] && !@deprecated_relative_permalinks
         $stderr.puts # Places newline after "Generating..."
-        Jekyll.logger.warn "Deprecation:", "Starting in 1.1, permalinks for pages" +
+        Jekyll.logger.warn "Deprecation:", "Starting in 2.0, permalinks for pages" +
                                             " in subfolders must be relative to the" +
                                             " site source directory, not the parent" +
                                             " directory. Check http://jekyllrb.com/docs/upgrading/"+
diff --git a/site/docs/upgrading.md b/site/docs/upgrading.md
index c15218fb..3cf5a1ef 100644
--- a/site/docs/upgrading.md
+++ b/site/docs/upgrading.md
@@ -42,7 +42,7 @@ rebuild each time a file changes, just add the `--watch` flag at the end.
 ### Absolute Permalinks
 
 In Jekyll v1.0, we introduced absolute permalinks for pages in subdirectories.
-Until v1.1, it is **opt-in**. Starting with v1.1, however, absolute permalinks
+Until v2.0, it is **opt-in**. Starting with v2.0, however, absolute permalinks
 will become **opt-out**, meaning Jekyll will default to using absolute permalinks
 instead of relative permalinks.
 
@@ -50,9 +50,9 @@ instead of relative permalinks.
 * To continue using relative permalinks, set `relative_permalinks: true` in your configuration file.
 
 <div class="note warning" id="absolute-permalinks-warning">
-  <h5 markdown="1">Absolute permalinks will be default in v1.1 and on</h5>
+  <h5 markdown="1">Absolute permalinks will be default in v2.0 and on</h5>
   <p markdown="1">
-    Starting with Jekyll v1.1.0, `relative_permalinks` will default to `false`,
+    Starting with Jekyll v2.0, `relative_permalinks` will default to `false`,
     meaning all pages will be built using the absolute permalink behaviour.
     The switch will still exist until v2.0.
   </p>