diff --git a/README.md b/README.md
index e2f0f119..9028f392 100644
--- a/README.md
+++ b/README.md
@@ -13,7 +13,7 @@ combinations. For instance, **ö** is obtained using **o** and **"**, and
 Download
 --------
 
-Latest release: [WinCompose-Setup-0.6.1.exe](/bin/WinCompose-Setup-0.6.1.exe)
+Latest release: [WinCompose-Setup-0.6.2.exe](/bin/WinCompose-Setup-0.6.2.exe)
 
 Quick start
 -----------
@@ -91,6 +91,9 @@ Please report bugs to Sam Hocevar <sam@hocevar.net>
 News
 ----
 
+News for version 0.6.2 (17 April 2014)
+ - Fix grave performance issues by using a modified version of AutoHotKey.
+
 News for version 0.6.1 (14 April 2014)
  - Fix issues with the save files.
  - Czech translation.
diff --git a/src/Makefile b/src/Makefile
index 24f1bf7a..00238b00 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -1,5 +1,5 @@
 
-VERSION = 0.6.1.fix
+VERSION = 0.6.2
 
 ISS = installer.iss
 AHK = main.ahk
@@ -30,11 +30,7 @@ clean:
 check:
 	start tests.ahk
 
-fixsource:
-	sed -i 's/\(#define *VERSION *"\)[^"]*\(".*\)/\1$(VERSION)\2/' $(ISS)
-	sed -i 's/\(global *version *:= *"\)[^"]*\(".*\)/\1$(VERSION)\2/' $(AHK)
-
-installer: fixsource update-po $(DLL) $(EXE) $(ISS)
+installer: update-source update-po $(DLL) $(EXE) $(ISS)
 	rm -f $@
 	"$(ISCC)" $(ISS)
 
@@ -51,6 +47,10 @@ obj/%.o: $(RC) $(ICONS)
 	rm -f $@
 	$(WINDRES) $(RC) -o $@
 
+update-source:
+	sed -i 's/\(#define *VERSION *"\)[^"]*\(".*\)/\1$(VERSION)\2/' $(ISS)
+	sed -i 's/\(global *version *:= *"\)[^"]*\(".*\)/\1$(VERSION)\2/' $(AHK)
+
 update-po:
 	$(XGETTEXT) -LC -opo/wincompose.pot --from-code=utf-8 -k_ $(AHK) $(INC)
 	for l in $(PO); do msgmerge -U po/$$l.po po/wincompose.pot; done
diff --git a/src/ahk2exe b/src/ahk2exe
deleted file mode 160000
index 27d6a382..00000000
--- a/src/ahk2exe
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 27d6a3824bab229fb49893b58fffc0a078890d1f
diff --git a/src/installer.iss b/src/installer.iss
index 9e6598af..032f5898 100644
--- a/src/installer.iss
+++ b/src/installer.iss
@@ -1,5 +1,5 @@
 #define NAME "WinCompose"
-#define VERSION "0.6.1.fix"
+#define VERSION "0.6.2"
 
 [Setup]
 AppName = {#NAME}
diff --git a/src/main.ahk b/src/main.ahk
index d83da9e9..990e1a0e 100644
--- a/src/main.ahk
+++ b/src/main.ahk
@@ -17,7 +17,7 @@
 
 ; The name and version of this script
 global app := "WinCompose"
-global version := "0.6.1.fix"
+global version := "0.6.2"
 global website := "https://github.com/samhocevar/wincompose"
 
 ; Configuration directory and file
diff --git a/src/po/cs.po b/src/po/cs.po
index 5f9505d9..e08a2823 100644
--- a/src/po/cs.po
+++ b/src/po/cs.po
@@ -8,11 +8,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-04-11 17:38+0200\n"
+"POT-Creation-Date: 2014-04-17 18:19+0200\n"
 "PO-Revision-Date: 2014-04-12 11:54+0200\n"
 "Last-Translator: Michal Čihař <michal@cihar.com>\n"
-"Language-Team: Czech "
-"<https://hosted.weblate.org/projects/wincompose/master/cs/>\n"
+"Language-Team: Czech <https://hosted.weblate.org/projects/wincompose/master/"
+"cs/>\n"
 "Language: cs\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -20,11 +20,11 @@ msgstr ""
 "Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
 "X-Generator: Weblate 1.9-dev\n"
 
-#: main.ahk:417
+#: main.ahk:433
 msgid "Loaded @1@ Sequences"
 msgstr "Nahráno @1@ sekvencí"
 
-#: main.ahk:417
+#: main.ahk:433
 msgid "Compose Key is @1@"
 msgstr ""
 
@@ -120,7 +120,7 @@ msgstr ""
 msgid "Timeout"
 msgstr ""
 
-#: ui.ahk:54 ui.ahk:299 ui.ahk:308 ui.ahk:316
+#: ui.ahk:54 ui.ahk:295 ui.ahk:305 ui.ahk:314
 msgid "Disable"
 msgstr ""
 
@@ -188,18 +188,18 @@ msgstr "Zavřít"
 msgid "Copy Character"
 msgstr ""
 
-#: ui.ahk:232
+#: ui.ahk:228
 msgid "Description:"
 msgstr "Popis:"
 
-#: ui.ahk:302
+#: ui.ahk:299
 msgid "@APP_NAME@ (disabled)"
 msgstr "@APP_NAME@ (vypnuto)"
 
-#: ui.ahk:311
+#: ui.ahk:309
 msgid "@APP_NAME@ (active)"
 msgstr "@APP_NAME@ (aktivní)"
 
-#: ui.ahk:319
+#: ui.ahk:318
 msgid "@APP_NAME@ (typing)"
 msgstr "@APP_NAME@ (píše)"
diff --git a/src/po/fr.po b/src/po/fr.po
index bc30604c..81ca877a 100644
--- a/src/po/fr.po
+++ b/src/po/fr.po
@@ -8,21 +8,21 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-04-11 17:03+0200\n"
+"POT-Creation-Date: 2014-04-17 18:19+0200\n"
 "PO-Revision-Date: 2014-04-13 20:01+0200\n"
 "Last-Translator: Sam Hocevar <sam@hocevar.net>\n"
-"Language-Team: French "
-"<https://hosted.weblate.org/projects/wincompose/master/fr/>\n"
+"Language-Team: French <https://hosted.weblate.org/projects/wincompose/master/"
+"fr/>\n"
 "Language: fr\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: main.ahk:417
+#: main.ahk:433
 msgid "Loaded @1@ Sequences"
 msgstr "@1@ séquences chargées"
 
-#: main.ahk:417
+#: main.ahk:433
 msgid "Compose Key is @1@"
 msgstr "Touche compose : @1@"
 
@@ -118,7 +118,7 @@ msgstr "Touche compose"
 msgid "Timeout"
 msgstr "Délai"
 
-#: ui.ahk:54 ui.ahk:299 ui.ahk:308 ui.ahk:316
+#: ui.ahk:54 ui.ahk:295 ui.ahk:305 ui.ahk:314
 msgid "Disable"
 msgstr "Désactiver"
 
@@ -186,18 +186,18 @@ msgstr "Fermer"
 msgid "Copy Character"
 msgstr "Copier le caractère"
 
-#: ui.ahk:232
+#: ui.ahk:228
 msgid "Description:"
 msgstr "Description :"
 
-#: ui.ahk:302
+#: ui.ahk:299
 msgid "@APP_NAME@ (disabled)"
 msgstr "@APP_NAME@ (inactif)"
 
-#: ui.ahk:311
+#: ui.ahk:309
 msgid "@APP_NAME@ (active)"
 msgstr "@APP_NAME@ (actif)"
 
-#: ui.ahk:319
+#: ui.ahk:318
 msgid "@APP_NAME@ (typing)"
 msgstr "@APP_NAME@ (en cours)"
diff --git a/src/po/wincompose.pot b/src/po/wincompose.pot
index 0f65fee7..d4e93b85 100644
--- a/src/po/wincompose.pot
+++ b/src/po/wincompose.pot
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-04-14 10:53+0200\n"
+"POT-Creation-Date: 2014-04-17 18:19+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -18,11 +18,11 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: main.ahk:417
+#: main.ahk:433
 msgid "Loaded @1@ Sequences"
 msgstr ""
 
-#: main.ahk:417
+#: main.ahk:433
 msgid "Compose Key is @1@"
 msgstr ""
 
@@ -118,7 +118,7 @@ msgstr ""
 msgid "Timeout"
 msgstr ""
 
-#: ui.ahk:54 ui.ahk:299 ui.ahk:308 ui.ahk:316
+#: ui.ahk:54 ui.ahk:295 ui.ahk:305 ui.ahk:314
 msgid "Disable"
 msgstr ""
 
@@ -186,18 +186,18 @@ msgstr ""
 msgid "Copy Character"
 msgstr ""
 
-#: ui.ahk:232
+#: ui.ahk:228
 msgid "Description:"
 msgstr ""
 
-#: ui.ahk:302
+#: ui.ahk:299
 msgid "@APP_NAME@ (disabled)"
 msgstr ""
 
-#: ui.ahk:311
+#: ui.ahk:309
 msgid "@APP_NAME@ (active)"
 msgstr ""
 
-#: ui.ahk:319
+#: ui.ahk:318
 msgid "@APP_NAME@ (typing)"
 msgstr ""