diff --git a/system/installer/Calamares/actions.py b/system/installer/Calamares/actions.py
index 145da33140..39d0436166 100644
--- a/system/installer/Calamares/actions.py
+++ b/system/installer/Calamares/actions.py
@@ -16,22 +16,22 @@ def setup():
     cmaketools.configure("-DCMAKE_BUILD_TYPE=Debug \
                           -DCMAKE_INSTALL_PREFIX=/usr \
                           -DCMAKE_INSTALL_LIBDIR=lib \
+                          -DWITH_PYTHONQT=OFF \
+                          -DINSTALL_CONFIG=ON \
                           -DWITH_CRASHREPORTER=ON", \
                           sourceDir=".." )
     
 def build():
-    #shelltools.makedirs("build")
     shelltools.cd("build")
     
     cmaketools.make()
 
 def install():
-    #shelltools.makedirs("build")
     shelltools.cd("build")
     cmaketools.install()
     
-    pisitools.insinto("/usr/share/calamares", "../settings.conf")
-    pisitools.insinto("/usr/share/calamares/modules", "src/modules/machineid/machineid.conf")
+    #pisitools.insinto("/usr/share/calamares", "../settings.conf")
+    #pisitools.insinto("/usr/share/calamares/modules", "src/modules/machineid/machineid.conf")
     
     #dbus configuration for pisi
     pisitools.dosed("%s/usr/share/calamares/modules/machineid.conf" % get.installDIR(), "systemd: true", "systemd: false")
diff --git a/system/installer/Calamares/files/pisilocalayar.patch b/system/installer/Calamares/files/pisilocalayar.patch
index e08898ce50..b66adba1d0 100644
--- a/system/installer/Calamares/files/pisilocalayar.patch
+++ b/system/installer/Calamares/files/pisilocalayar.patch
@@ -105,13 +105,13 @@ diff -Nuar a/src/modules/packages/main.py b/src/modules/packages/main.py
      def update_system(self):
          # Doesn't need to update the system explicitly
 diff -Nuar a/src/modules/partition/gui/EncryptWidget.cpp b/src/modules/partition/gui/EncryptWidget.cpp
---- a/src/modules/partition/gui/EncryptWidget.cpp	2020-02-28 01:26:29.000000000 +0300
-+++ b/src/modules/partition/gui/EncryptWidget.cpp	2020-03-21 13:57:03.877887447 +0300
-@@ -31,6 +31,7 @@
-     m_passphraseLineEdit->hide();
-     m_confirmLineEdit->hide();
-     m_iconLabel->hide();
-+    m_encryptCheckBox->hide();
+--- a/src/modules/partition/gui/EncryptWidget.cpp	2020-03-28 01:43:50.000000000 +0300
++++ b/src/modules/partition/gui/EncryptWidget.cpp	2020-04-06 12:08:51.169929059 +0300
+@@ -36,6 +36,7 @@
+     m_ui->m_passphraseLineEdit->hide();
+     m_ui->m_confirmLineEdit->hide();
+     m_ui->m_iconLabel->hide();
++    m_ui->m_encryptCheckBox->hide();
  
-     connect( m_encryptCheckBox, &QCheckBox::stateChanged,
-              this, &EncryptWidget::onCheckBoxStateChanged );
+     connect( m_ui->m_encryptCheckBox, &QCheckBox::stateChanged, this, &EncryptWidget::onCheckBoxStateChanged );
+     connect( m_ui->m_passphraseLineEdit, &QLineEdit::textEdited, this, &EncryptWidget::onPassphraseEdited );
diff --git a/system/installer/Calamares/pspec.xml b/system/installer/Calamares/pspec.xml
index d1728b7b79..b0ea666828 100644
--- a/system/installer/Calamares/pspec.xml
+++ b/system/installer/Calamares/pspec.xml
@@ -11,7 +11,7 @@
         <License>LGPLv2</License>
         <Summary>A distribution independent installer framework</Summary>
         <Description>Calamares is a distribution-independent system installer, with an advanced partitioning feature for both manual and automated partitioning operations.</Description>
-        <Archive sha1sum="6f23d53c68ca691dcbf6e1bdbd298c076b17e862" type="targz">https://github.com/calamares/calamares/archive/v3.2.20.tar.gz</Archive>
+        <Archive sha1sum="cffd77da16e5d975b41edf5da8c8b6e956721072" type="targz">https://github.com/calamares/calamares/archive/v3.2.21.tar.gz</Archive>
         <BuildDependencies>
             <Dependency>gettext-devel</Dependency>
             <Dependency>yaml-cpp</Dependency>
@@ -117,6 +117,13 @@
     </Package>
     
     <History>
+        <Update release="15">
+            <Date>2020-04-06</Date>
+            <Version>3.2.21</Version>
+            <Comment>Version bump.</Comment>
+            <Name>Mustafa Cinasal</Name>
+            <Email>muscnsl@gmail.com</Email>
+        </Update>
         <Update release="14">
             <Date>2020-03-21</Date>
             <Version>3.2.20</Version>