diff --git a/Koha.pm b/Koha.pm
index 322b45cea6..1787ccbfdd 100644
--- a/Koha.pm
+++ b/Koha.pm
@@ -29,7 +29,7 @@ use vars qw{ $VERSION };
 # - #4 : the developer version. The 4th number is the database subversion.
 #        used by developers when the database changes. updatedatabase take care of the changes itself
 #        and is automatically called by Auth.pm when needed.
-$VERSION = "3.21.00.029";
+$VERSION = "3.21.00.030";
 
 sub version {
     return $VERSION;
diff --git a/installer/data/mysql/atomicupdate/14201_marc21_leader_book.sql b/installer/data/mysql/atomicupdate/14201_marc21_leader_book.sql
deleted file mode 100644
index a485b6cee8..0000000000
--- a/installer/data/mysql/atomicupdate/14201_marc21_leader_book.sql
+++ /dev/null
@@ -1,2 +0,0 @@
--- move marc21_leader_book to marc21_leader
-update marc_subfield_structure set value_builder='marc21_leader.pl' where value_builder='marc21_leader_book.pl';
diff --git a/installer/data/mysql/atomicupdate/14201b_computerfile.sql b/installer/data/mysql/atomicupdate/14201b_computerfile.sql
deleted file mode 100644
index 6fb189ac64..0000000000
--- a/installer/data/mysql/atomicupdate/14201b_computerfile.sql
+++ /dev/null
@@ -1,2 +0,0 @@
--- move marc21_leader_computerfile to marc21_leader
-update marc_subfield_structure set value_builder='marc21_leader.pl' where value_builder='marc21_leader_computerfile.pl';
diff --git a/installer/data/mysql/atomicupdate/14201c_video.sql b/installer/data/mysql/atomicupdate/14201c_video.sql
deleted file mode 100644
index f3d1689aac..0000000000
--- a/installer/data/mysql/atomicupdate/14201c_video.sql
+++ /dev/null
@@ -1,2 +0,0 @@
--- move marc21_leader_video to marc21_leader
-update marc_subfield_structure set value_builder='marc21_leader.pl' where value_builder='marc21_leader_video.pl';
diff --git a/installer/data/mysql/updatedatabase.pl b/installer/data/mysql/updatedatabase.pl
index 9761bf21bd..8de3441352 100755
--- a/installer/data/mysql/updatedatabase.pl
+++ b/installer/data/mysql/updatedatabase.pl
@@ -10924,6 +10924,27 @@ if ( CheckVersion($DBversion) ) {
     SetVersion($DBversion);
 }
 
+$DBversion = "3.21.00.030";
+if ( CheckVersion($DBversion) ) {
+    $dbh->do(q{
+        UPDATE marc_subfield_structure
+        SET value_builder='marc21_leader.pl'
+        WHERE value_builder='marc21_leader_book.pl'
+    });
+    $dbh->do(q{
+        UPDATE marc_subfield_structure
+        SET value_builder='marc21_leader.pl'
+        WHERE value_builder='marc21_leader_computerfile.pl'
+    });
+    $dbh->do(q{
+        UPDATE marc_subfield_structure
+        SET value_builder='marc21_leader.pl'
+        WHERE value_builder='marc21_leader_video.pl'
+    });
+    print "Upgrade to $DBversion done (Bug 14201: Remove unused code or template from some MARC21 leader plugins )\n";
+    SetVersion($DBversion);
+}
+
 # DEVELOPER PROCESS, search for anything to execute in the db_update directory
 # SEE bug 13068
 # if there is anything in the atomicupdate, read and execute it.