diff --git a/airootfs/usr/share/applications/calamares.desktop b/airootfs/usr/share/applications/calamares.desktop
new file mode 100644
index 0000000..020a87a
--- /dev/null
+++ b/airootfs/usr/share/applications/calamares.desktop
@@ -0,0 +1,13 @@
+[Desktop Entry]
+Type=Application
+Version=1.0
+Name=Install using Calamares (Experimental)
+GenericName=System Installer
+Comment=Install Antergos NeXT using Calamares (experimental)
+Keywords=calamares;system;installer;
+TryExec=calamares
+Exec=sudo -E calamares -d
+Categories=Qt;System;
+Icon=calamares
+Terminal=false
+StartupNotify=true
diff --git a/packages.x86_64 b/packages.x86_64
index 797af01..229e743 100644
--- a/packages.x86_64
+++ b/packages.x86_64
@@ -270,5 +270,7 @@ yay
 
 ## Installer
 cnchi
+calamares
+calamares-branding-antergos-next
 mpv
 antergos-next-memes
diff --git a/run_before_squashfs.sh b/run_before_squashfs.sh
index 2f395a4..3b0cbde 100755
--- a/run_before_squashfs.sh
+++ b/run_before_squashfs.sh
@@ -183,6 +183,12 @@ mkdir -p "/usr/share/cnchi-memes"
 echo "---> Fix cnchi desktop file to use sudo -E --->"
 sed -i 's|^Exec=.*cnchi.*|Exec=sudo -E cnchi|' "/usr/share/applications/cnchi.desktop"
 
+echo "---> Fix calamares desktop file to use sudo -E --->"
+sed -i 's|^Exec=.*calamares.*|Exec=sudo -E calamares -d|' "/usr/share/applications/calamares.desktop" 2>/dev/null || true
+
+echo "---> Symlink antergos icon for calamares branding --->"
+ln -sf "/usr/share/antergos/antergos-icon.png" "/usr/share/calamares/branding/antergos-next/squid.png" 2>/dev/null || true
+
 # cnchi 0.17.1+ already has the regain_privileges fix in source
 
 echo "---> Set Antergos NeXT os-release --->"