diff --git a/Koha.pm b/Koha.pm
index df43c933c0..d4f5f8b477 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.036";
+$VERSION = "3.21.00.037";
 
 sub version {
     return $VERSION;
diff --git a/installer/data/mysql/atomicupdate/bug_8236-add-overduesblockrenewing.sql b/installer/data/mysql/atomicupdate/bug_8236-add-overduesblockrenewing.sql
deleted file mode 100644
index 72f5406494..0000000000
--- a/installer/data/mysql/atomicupdate/bug_8236-add-overduesblockrenewing.sql
+++ /dev/null
@@ -1 +0,0 @@
-INSERT INTO systempreferences (variable,value,explanation,options,type) VALUES ('OverduesBlockRenewing','allow','If any of a patron checked out documents is late, should renewal be allowed, blocked only on overdue items or blocked on whatever checked out document','allow|blockitem|block','Choice');
\ No newline at end of file
diff --git a/installer/data/mysql/atomicupdate/bug_8236-add-restrictionblockrenewing.sql b/installer/data/mysql/atomicupdate/bug_8236-add-restrictionblockrenewing.sql
deleted file mode 100644
index 4d3e01409d..0000000000
--- a/installer/data/mysql/atomicupdate/bug_8236-add-restrictionblockrenewing.sql
+++ /dev/null
@@ -1 +0,0 @@
-INSERT INTO systempreferences (variable,value,explanation,options,type) VALUES ('RestrictionBlockRenewing','0','If patron is restricted, should renewal be allowed or blocked',NULL,'YesNo');
\ No newline at end of file
diff --git a/installer/data/mysql/updatedatabase.pl b/installer/data/mysql/updatedatabase.pl
index e6135cdd31..14c3547560 100755
--- a/installer/data/mysql/updatedatabase.pl
+++ b/installer/data/mysql/updatedatabase.pl
@@ -11106,6 +11106,20 @@ if ( CheckVersion($DBversion) ) {
    SetVersion($DBversion);
 }
 
+$DBversion = "3.21.00.037";
+if ( CheckVersion($DBversion) ) {
+   $dbh->do(q{
+       INSERT IGNORE INTO systempreferences (variable,value,explanation,options,type)
+       VALUES ('OverduesBlockRenewing','allow','If any of a patron checked out documents is late, should renewal be allowed, blocked only on overdue items or blocked on whatever checked out document','allow|blockitem|block','Choice')
+   });
+   $dbh->do(q{
+       INSERT IGNORE INTO systempreferences (variable,value,explanation,options,type)
+       VALUES ('RestrictionBlockRenewing','0','If patron is restricted, should renewal be allowed or blocked',NULL,'YesNo')
+    });
+   print "Upgrade to $DBversion done (Bug 8236: Prevent renewing if overdue or restriction)\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.