diff --git a/.gitignore b/.gitignore
index d2fba220..37ce1dbb 100644
--- a/.gitignore
+++ b/.gitignore
@@ -8,7 +8,7 @@ t/tmp/
 MYMETA.*
 /bin/add_constituency
 /etc/add_constituency
-/etc/upgrade/upgrade.pl
+/etc/upgrade/rtir-2.4-upgrade.pl
 /etc/upgrade/2.5.1/update_saved_searches.pl
 /lib/RT/IR/Test.pm
 .prove
diff --git a/MANIFEST b/MANIFEST
index 155ce342..312cc3de 100644
--- a/MANIFEST
+++ b/MANIFEST
@@ -48,7 +48,7 @@ etc/upgrade/2.9.0/content
 etc/upgrade/3.0.0rc2/content
 etc/upgrade/3.1.0/content
 etc/upgrade/3.3.0/content
-etc/upgrade/upgrade.pl.in
+etc/upgrade/rtir-2.4-upgrade.pl.in
 html/Callbacks/RTIR/autohandler/SuccessfulLogin
 html/Callbacks/RTIR/Elements/Header/Head
 html/Callbacks/RTIR/Elements/MakeClicky/Default
diff --git a/MANIFEST.SKIP b/MANIFEST.SKIP
index cae5c94d..b7e1f7f3 100644
--- a/MANIFEST.SKIP
+++ b/MANIFEST.SKIP
@@ -12,7 +12,7 @@
 ^MYMETA\.*
 ^bin/add_constituency$
 ^etc/add_constituency$
-^etc/upgrade/upgrade.pl$
+^etc/upgrade/rtir-2.4-upgrade.pl$
 ^etc/upgrade/2.5.1/update_saved_searches.pl$
 ^lib/RT/IR/Test.pm$
 ^\.prove
diff --git a/Makefile.PL b/Makefile.PL
index b609a643..91741a36 100644
--- a/Makefile.PL
+++ b/Makefile.PL
@@ -33,7 +33,7 @@ requires('Parse::BooleanLogic');
 # for tests
 build_requires('Test::More');
 build_requires('File::Find');
-# for etc/upgrade/upgrade.pl
+# for etc/upgrade/rtir-2.4-upgrade.pl
 build_requires('File::Temp');
 
 auto_install();
@@ -43,7 +43,7 @@ substitute( {
         PERL        => $ENV{PERL} || $secure_perl_path,
     },
     { sufix => '.in' },
-    'etc/upgrade/upgrade.pl',
+    'etc/upgrade/rtir-2.4-upgrade.pl',
     'etc/add_constituency',
     'bin/add_constituency',
     'lib/RT/IR/Test.pm',
diff --git a/docs/UPGRADING-2.4 b/docs/UPGRADING-2.4
index 8bd33997..ebbf72b8 100644
--- a/docs/UPGRADING-2.4
+++ b/docs/UPGRADING-2.4
@@ -3,7 +3,7 @@
 The following describes some of the key components of the upgrade
 to RTIR 2.4 from all previous versions of RTIR.
 
-The F<etc/upgrade/upgrade.pl> script is mentioned several times
+The F<etc/upgrade/rtir-2.4-upgrade.pl> script is mentioned several times
 for different versions. You only need to run it once and the most
 recent version is now included in the RTIR distribution.
 
@@ -29,7 +29,7 @@ update the DB.
 
 =head1 Upgrading from 2.3.15 and Earlier
 
-There was an error in an earlier version of the F<etc/upgrade/upgrade.pl>
+There was an error in an earlier version of the F<etc/upgrade/rtir-2.4-upgrade.pl>
 script where it could skip some incidents during upgrade. Run the new version
 of this script, especially if you never ran it or ran with earlier versions
 of RTIR.
@@ -124,7 +124,7 @@ the code of the scrips then you have to port changes.
 
 =item 2
 
-Run the F<etc/upgrade/upgrade.pl> script. This script updates Due Dates
+Run the F<etc/upgrade/rtir-2.4-upgrade.pl> script. This script updates Due Dates
 on active incidents where they are not set and sets them to the most
 recent due date of the active children.
 
diff --git a/etc/upgrade/upgrade.pl.in b/etc/upgrade/rtir-2.4-upgrade.pl.in
similarity index 100%
rename from etc/upgrade/upgrade.pl.in
rename to etc/upgrade/rtir-2.4-upgrade.pl.in