diff --git a/airsonic-main/src/main/resources/liquibase/10.2/setup-hsqldb-checkpoint-defrag.xml b/airsonic-main/src/main/resources/liquibase/10.2/setup-hsqldb-checkpoint-defrag.xml
index a028b8ce..8377af76 100644
--- a/airsonic-main/src/main/resources/liquibase/10.2/setup-hsqldb-checkpoint-defrag.xml
+++ b/airsonic-main/src/main/resources/liquibase/10.2/setup-hsqldb-checkpoint-defrag.xml
@@ -2,12 +2,13 @@
         xmlns="http://www.liquibase.org/xml/ns/dbchangelog"
         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
         xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.1.xsd">
-    <changeSet id="setup-hsqldb-checkpoint-defrag" author="fxthomas">
-
-        <validCheckSum>7:890e52428bbc2a792fea1e026a4b7610</validCheckSum>
+    <changeSet id="setup-hsqldb-2-checkpoint-defrag" author="fxthomas">
 
-        <preConditions onFail="MARK_RAN">
+        <preConditions onFail="CONTINUE">
           <dbms type="hsqldb" />
+          <customPrecondition className="org.airsonic.player.spring.DbmsVersionPrecondition" >
+            <param name="major" value="2" />
+          </customPrecondition>
         </preConditions>
 
         <sql>
@@ -26,4 +27,31 @@
         <rollback></rollback>
 
     </changeSet>
+    <changeSet id="setup-hsqldb-checkpoint-defrag" author="fxthomas">
+
+        <validCheckSum>7:890e52428bbc2a792fea1e026a4b7610</validCheckSum>
+
+        <preConditions onFail="CONTINUE">
+          <dbms type="hsqldb" />
+          <customPrecondition className="org.airsonic.player.spring.DbmsVersionPrecondition" >
+            <param name="major" value="1" />
+          </customPrecondition>
+        </preConditions>
+
+        <sql>
+          CHECKPOINT DEFRAG;
+          <comment>Defragment the database before enabling auto defrag, so that the biggest part of the work is done during migration.</comment>
+        </sql>
+        <sql>
+          SET LOGSIZE 64;
+          <comment>Automatically run a CHECKPOINT when the log is above 64MB.</comment>
+        </sql>
+        <sql>
+          SET CHECKPOINT DEFRAG 32;
+          <comment>Sets the threshold in percentage for performing a DEFRAG during a checkpoint.</comment>
+        </sql>
+
+        <rollback></rollback>
+
+    </changeSet>
 </databaseChangeLog>