diff --git a/core/data/System/Skins.txt b/core/data/System/Skins.txt
index 35768722c3..96996f6d31 100644
--- a/core/data/System/Skins.txt
+++ b/core/data/System/Skins.txt
@@ -53,7 +53,6 @@ The following template names are used for Foswiki screens, and are referenced in
       * =no_such_topic=, =no_such_web=, =only_group=, =topic_access=
    * =oopsattention= - used to format Attention messages
       * =already_exists=, =bad_email=, =bad_ver_code=, =bad_wikiname=, =base_web_missing=, =confirm=, =created_web=, =delete_err=, =invalid_web_color=, =invalid_web_name=, =in_a_group=, =mandatory_field=, =merge_notice=, =missing_action=, =missing_fields=, =move_err=, =missing_action=, =no_form_def=, =no_users_to_reset=, =not_a_user=, =oversized_upload=, =password_changed=, =password_mismatch=, =problem_adding=, =remove_user_done=, =rename_err=, =rename_not_wikiword=, =rename_topic_exists=, =rename_web_err=, =rename_web_exists=, =rename_web_prerequisites=, =reset_bad=, =reset_ok=, =save_error=, =send_mail_error=, =thanks=, =topic_exists=, =unrecognized_action=, =upload_name_changed=, =web_creation_error=, =web_exists=, =web_missing=, =wrong_password=, =zero_size_upload=
-   * =oopschangelanguage= - used to prompt for a new language when internationalisation is enabled
    * =oopsgeneric= - a basic dialog for user information; provides "ok" button only
    * =oopslanguagechanged= - used to confirm a new language when internationalisation is enabled
    * =oopsleaseconflict= - used to format lease Conflict messages
diff --git a/core/templates/oopschangelanguage.tmpl b/core/templates/oopschangelanguage.tmpl
index 765a74b39a..734dbd0198 100644
--- a/core/templates/oopschangelanguage.tmpl
+++ b/core/templates/oopschangelanguage.tmpl
@@ -1,26 +1 @@
-%{ This is a default template }%%TMPL:INCLUDE{"foswiki"}%
-%TMPL:DEF{"titleaction"}% %MAKETEXT{"(change language)"}% %TMPL:END%
-%TMPL:DEF{"webaction"}%%TMPL:END%
-%TMPL:DEF{"heading"}%%MAKETEXT{"Change language"}%%TMPL:END%
-
-%TMPL:DEF{"languagenotes"}%
-%ICON{info}% %MAKETEXT{"You can set your favorite language permanently by setting the [_1] variable in your user topic." args="*LANGUAGE*"}%
-%TMPL:END%
-
-%TMPL:DEF{"content"}%
-
-%MAKETEXT{"Foswiki's user interface is available in several languages. If you want to change the language for this session, choose one of the following and hit \"Change language\". Otherwise, follow the \"Cancel\" link on the bottom of the page to return to the previous topic."}%
-
-<center>
-<form action="%SCRIPTURLPATH{"oops"}%/%WEB%/%TOPIC%" method="post">
-  <select name="language">
-    %LANGUAGES{format="<option $marker value='$langtag'>$langname</option>" selection="%LANGUAGE%"}%
-  </select>
-  <input type="hidden" name="template" value="oopslanguagechanged"/>
-  <input type="submit" class="foswikiSubmit" value=' %MAKETEXT{"Change language"}% ' />
-</form>
-</center>
-
-%TMPL:P{"languagenotes"}%
-%TMPL:P{"topicinfo"}%
-%TMPL:END%
\ No newline at end of file
+%{ This template is no longer used, and will be removed in a future release }%
\ No newline at end of file