diff --git a/Gemfile.lock b/Gemfile.lock
index 2c0bf99c0..85693b3ea 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -1,7 +1,7 @@
 PATH
   remote: plugins/ShinyAccess
   specs:
-    shiny_access (21.05)
+    shiny_access (21.06)
       acts-as-taggable-on
       acts_as_paranoid
       nokogiri (>= 1.11.0.rc4)
@@ -13,7 +13,7 @@ PATH
 PATH
   remote: plugins/ShinyBlog
   specs:
-    shiny_blog (21.05)
+    shiny_blog (21.06)
       acts-as-taggable-on
       acts_as_paranoid
       ckeditor
@@ -26,7 +26,7 @@ PATH
 PATH
   remote: plugins/ShinyCMS
   specs:
-    shinycms (21.05)
+    shinycms (21.06)
       activerecord-session_store
       acts-as-taggable-on
       acts_as_list
@@ -69,7 +69,7 @@ PATH
 PATH
   remote: plugins/ShinyForms
   specs:
-    shiny_forms (21.05)
+    shiny_forms (21.06)
       acts_as_paranoid
       nokogiri (>= 1.11.0.rc4)
       pagy
@@ -80,7 +80,7 @@ PATH
 PATH
   remote: plugins/ShinyInserts
   specs:
-    shiny_inserts (21.05)
+    shiny_inserts (21.06)
       acts_as_paranoid
       ckeditor
       nokogiri (>= 1.11.0.rc4)
@@ -92,7 +92,7 @@ PATH
 PATH
   remote: plugins/ShinyLists
   specs:
-    shiny_lists (21.05)
+    shiny_lists (21.06)
       acts_as_paranoid
       nokogiri (>= 1.11.0.rc4)
       pagy
@@ -103,7 +103,7 @@ PATH
 PATH
   remote: plugins/ShinyNews
   specs:
-    shiny_news (21.05)
+    shiny_news (21.06)
       acts-as-taggable-on
       acts_as_paranoid
       ckeditor
@@ -116,7 +116,7 @@ PATH
 PATH
   remote: plugins/ShinyNewsletters
   specs:
-    shiny_newsletters (21.05)
+    shiny_newsletters (21.06)
       acts_as_paranoid
       ckeditor
       nokogiri (>= 1.11.0.rc4)
@@ -128,7 +128,7 @@ PATH
 PATH
   remote: plugins/ShinyPages
   specs:
-    shiny_pages (21.05)
+    shiny_pages (21.06)
       acts_as_paranoid
       ckeditor
       nokogiri (>= 1.11.0.rc4)
@@ -140,7 +140,7 @@ PATH
 PATH
   remote: plugins/ShinyProfiles
   specs:
-    shiny_profiles (21.05)
+    shiny_profiles (21.06)
       acts_as_paranoid
       nokogiri (>= 1.11.0.rc4)
       pagy
@@ -151,7 +151,7 @@ PATH
 PATH
   remote: plugins/ShinySEO
   specs:
-    shiny_seo (21.05)
+    shiny_seo (21.06)
       pg (>= 0.18, < 2.0)
       rails (~> 6.1.2, >= 6.1.2.1)
       sitemap_generator
@@ -159,7 +159,7 @@ PATH
 PATH
   remote: plugins/ShinySearch
   specs:
-    shiny_search (21.05)
+    shiny_search (21.06)
       acts-as-taggable-on
       acts_as_paranoid
       algoliasearch-rails (~> 1.25)
diff --git a/config/initializers/version.rb b/config/initializers/version.rb
index f3dd149c1..018b25313 100644
--- a/config/initializers/version.rb
+++ b/config/initializers/version.rb
@@ -9,9 +9,9 @@
 # This version number is specifically for the ShinyHostApp
 
 # Each ShinyCMS plugin has its own version number
-# The core plugin is currently at version 21.05
+# The core plugin is currently at version 21.06
 
 module ShinyHostApp
-  VERSION = '21.05'
+  VERSION = '21.06'
   public_constant :VERSION
 end
diff --git a/docs/release-notes.md b/docs/release-notes.md
index d4ce529b0..3d4c9a519 100644
--- a/docs/release-notes.md
+++ b/docs/release-notes.md
@@ -4,6 +4,54 @@
 
 This file contains information about changes (particularly breaking changes) between releases - with the most recent release first.
 
+### 2021-06-02  21.06  June 2021: The 'Happy Birthday, Fliss!' Edition
+
+GitHub tag: https://github.com/denny/ShinyCMS-ruby/releases/tag/v21.06
+
+Fixed:
+* .pryrc now checks in Heroku ENV for 'staging' in hostname (and sets rails console prompt appropriately if found), instead of running `hostname` command which was breaking for some people
+
+Added:
+* 'Add element' feature for pages, newsletters, and their templates
+    * Relatedly, elements got their own controllers in each of those places
+* Separate HTML and plain text 'manage subscriptions' partials for emails
+* Initializer to disable concurrent asset compilation in Sprockets
+    * Seems like the most likely culprit causing build segfaults on CI
+* Pacman formatter for RSpec output :D
+    * Set SPECMAN=1 in your ENV before running `rspec` to enable this
+
+Removed:
+* Rails Best Practices gem; other tools cover all the same things
+
+Changed:
+* Continued changing partials to components in admin area
+    * Basically everything 'around the edges' is generated by components now
+    * Random refactoring bonus outcome; don't need to set @page_title in most admin views any more, it's automagic!
+* Changed how route partials work
+    * There's way more boilerplate now, but they do feel a bit more solid
+* Invoke ShinySearch separately in ShinyNews::Post and ShinyBlog::Post
+    * (instead of ShinyCMS::Post - so they can be configured differently)
+* Moved various top-level methods into classes, to reduce pollution
+    * Helper methods for Gemfile also moved from main_app to core plugin
+* Gemfile picks up Ruby version from .ruby-version (using helper method)
+* Moved `credits.md` to 'Contributors.md` which seems more common
+* Changed inheritance from core by feature plugin controllers/mailers/etc
+    * They now load common behaviour etc from a XyzBase module rather than inheriting it from a BaseXyz class, which feels like looser coupling
+
+Also updated:
+* `bundle update` and 'yarn upgrade`
+    * Fixed pagy, which was pinned due to breaking changes a few releases back
+    * But had to pin view_components this time :(
+
+Tidied:
+* Various documentation improvements from Paul Cochrane (@paultcochrane)
+* Tidied up Packwerk config files and i18n-tasks config
+* Moved 'loose' JavaScript from footer template into a .js file in assets
+
+ION:
+* Today is my flatmate's birthday! And it was either name the release for that, or call it 'the unemployed layabout release', as this is my first week off after finishing work on Friday. :)
+
+
 ### 2021-05-07  21.05  May 2021: The 'Component With A View' release
 
 GitHub tag: https://github.com/denny/ShinyCMS-ruby/releases/tag/v21.05
diff --git a/plugins/ShinyAccess/lib/shiny_access/version.rb b/plugins/ShinyAccess/lib/shiny_access/version.rb
index e66815efc..23793d703 100644
--- a/plugins/ShinyAccess/lib/shiny_access/version.rb
+++ b/plugins/ShinyAccess/lib/shiny_access/version.rb
@@ -8,6 +8,6 @@
 
 # Version number ('Ubuntu style'; year and month)
 module ShinyAccess
-  VERSION = '21.05'
+  VERSION = '21.06'
   public_constant :VERSION
 end
diff --git a/plugins/ShinyBlog/lib/shiny_blog/version.rb b/plugins/ShinyBlog/lib/shiny_blog/version.rb
index 281ba6b98..7922aa26d 100644
--- a/plugins/ShinyBlog/lib/shiny_blog/version.rb
+++ b/plugins/ShinyBlog/lib/shiny_blog/version.rb
@@ -8,6 +8,6 @@
 
 # Version number ('Ubuntu style', YY.MM) - ShinyBlog plugin for ShinyCMS
 module ShinyBlog
-  VERSION = '21.05'
+  VERSION = '21.06'
   public_constant :VERSION
 end
diff --git a/plugins/ShinyCMS/lib/shinycms/version.rb b/plugins/ShinyCMS/lib/shinycms/version.rb
index cb93a86f8..ccae33bb7 100644
--- a/plugins/ShinyCMS/lib/shinycms/version.rb
+++ b/plugins/ShinyCMS/lib/shinycms/version.rb
@@ -8,9 +8,10 @@
 
 # ShinyCMS version number ('Ubuntu style', YY.MM)
 module ShinyCMS
-  VERSION = '21.05'
+  VERSION = '21.06'
   public_constant :VERSION
 
+  # TODO: This doesn't work! .git generally isn't present on a deployed system.
   # Use the start of the git commit SHA as a release identifier
   # RELEASE = `git show --abbrev=4 --pretty=%h -q`.chomp
   # public_constant :RELEASE
diff --git a/plugins/ShinyForms/lib/shiny_forms/version.rb b/plugins/ShinyForms/lib/shiny_forms/version.rb
index 5eb7b3061..88892f9a3 100644
--- a/plugins/ShinyForms/lib/shiny_forms/version.rb
+++ b/plugins/ShinyForms/lib/shiny_forms/version.rb
@@ -8,6 +8,6 @@
 
 # Version number ('Ubuntu style', YY.MM) - ShinyForms plugin for ShinyCMS
 module ShinyForms
-  VERSION = '21.05'
+  VERSION = '21.06'
   public_constant :VERSION
 end
diff --git a/plugins/ShinyInserts/lib/shiny_inserts/version.rb b/plugins/ShinyInserts/lib/shiny_inserts/version.rb
index 902d4184c..c17f91a4f 100644
--- a/plugins/ShinyInserts/lib/shiny_inserts/version.rb
+++ b/plugins/ShinyInserts/lib/shiny_inserts/version.rb
@@ -8,6 +8,6 @@
 
 # Version number ('Ubuntu style', YY.MM) - ShinyInserts plugin for ShinyCMS
 module ShinyInserts
-  VERSION = '21.05'
+  VERSION = '21.06'
   public_constant :VERSION
 end
diff --git a/plugins/ShinyLists/lib/shiny_lists/version.rb b/plugins/ShinyLists/lib/shiny_lists/version.rb
index e11f49cc8..56a63cd01 100644
--- a/plugins/ShinyLists/lib/shiny_lists/version.rb
+++ b/plugins/ShinyLists/lib/shiny_lists/version.rb
@@ -8,6 +8,6 @@
 
 # Version number ('Ubuntu style', YY.MM) - ShinyLists plugin for ShinyCMS
 module ShinyLists
-  VERSION = '21.05'
+  VERSION = '21.06'
   public_constant :VERSION
 end
diff --git a/plugins/ShinyNews/lib/shiny_news/version.rb b/plugins/ShinyNews/lib/shiny_news/version.rb
index 7210e060e..b6edbd948 100644
--- a/plugins/ShinyNews/lib/shiny_news/version.rb
+++ b/plugins/ShinyNews/lib/shiny_news/version.rb
@@ -8,6 +8,6 @@
 
 # Version number ('Ubuntu style', YY.MM) - ShinyNews plugin for ShinyCMS
 module ShinyNews
-  VERSION = '21.05'
+  VERSION = '21.06'
   public_constant :VERSION
 end
diff --git a/plugins/ShinyNewsletters/lib/shiny_newsletters/version.rb b/plugins/ShinyNewsletters/lib/shiny_newsletters/version.rb
index f1a0f483f..3eeffb106 100644
--- a/plugins/ShinyNewsletters/lib/shiny_newsletters/version.rb
+++ b/plugins/ShinyNewsletters/lib/shiny_newsletters/version.rb
@@ -8,6 +8,6 @@
 
 # Version number ('Ubuntu style'; year and month)
 module ShinyNewsletters
-  VERSION = '21.05'
+  VERSION = '21.06'
   public_constant :VERSION
 end
diff --git a/plugins/ShinyPages/lib/shiny_pages/version.rb b/plugins/ShinyPages/lib/shiny_pages/version.rb
index 81577639f..220508f22 100644
--- a/plugins/ShinyPages/lib/shiny_pages/version.rb
+++ b/plugins/ShinyPages/lib/shiny_pages/version.rb
@@ -8,6 +8,6 @@
 
 # Version number ('Ubuntu style', YY.MM) - ShinyPages plugin for ShinyCMS
 module ShinyPages
-  VERSION = '21.05'
+  VERSION = '21.06'
   public_constant :VERSION
 end
diff --git a/plugins/ShinyProfiles/lib/shiny_profiles/version.rb b/plugins/ShinyProfiles/lib/shiny_profiles/version.rb
index 49fe39c0b..ff21aa234 100644
--- a/plugins/ShinyProfiles/lib/shiny_profiles/version.rb
+++ b/plugins/ShinyProfiles/lib/shiny_profiles/version.rb
@@ -8,6 +8,6 @@
 
 # Version number ('Ubuntu style', YY.MM) - ShinyProfiles plugin for ShinyCMS
 module ShinyProfiles
-  VERSION = '21.05'
+  VERSION = '21.06'
   public_constant :VERSION
 end
diff --git a/plugins/ShinySEO/lib/shiny_seo/version.rb b/plugins/ShinySEO/lib/shiny_seo/version.rb
index 8ab3ffbb1..959b84197 100644
--- a/plugins/ShinySEO/lib/shiny_seo/version.rb
+++ b/plugins/ShinySEO/lib/shiny_seo/version.rb
@@ -8,6 +8,6 @@
 
 # Version number ('Ubuntu style'; year and month)
 module ShinySEO
-  VERSION = '21.05'
+  VERSION = '21.06'
   public_constant :VERSION
 end
diff --git a/plugins/ShinySearch/lib/shiny_search/version.rb b/plugins/ShinySearch/lib/shiny_search/version.rb
index 1a30bae1b..3e258bfb5 100644
--- a/plugins/ShinySearch/lib/shiny_search/version.rb
+++ b/plugins/ShinySearch/lib/shiny_search/version.rb
@@ -8,6 +8,6 @@
 
 # Version number ('Ubuntu style', YY.MM) - ShinySearch plugin for ShinyCMS
 module ShinySearch
-  VERSION = '21.05'
+  VERSION = '21.06'
   public_constant :VERSION
 end