diff --git a/CLIENT_DATA/setup.ins b/CLIENT_DATA/setup.ins
index 9b7bdb2..78a6475 100644
--- a/CLIENT_DATA/setup.ins
+++ b/CLIENT_DATA/setup.ins
@@ -92,7 +92,7 @@ else
 endif
 
 [Winbatch_install_32]
-"%ScriptPath%\files" & "FontReg32.exe /copy"
+"%ScriptPath%\files\FontReg32.exe" /copy
 
 [Files_install_32]
 ; Example of recursively copying some files into the installation directory:
@@ -100,7 +100,7 @@ endif
 ; copy -s "%ScriptPath%\files\*.*" "$InstallDir32$"
 
 [Winbatch_install_64]
-"%ScriptPath%\files" & "FontReg64.exe /copy"
+"%ScriptPath%\files\FontReg64.exe" /copy
 
 [Files_install_64]
 ; Example of recursively copying some files into the installation directory:
diff --git a/build.sh b/build.sh
index 06269c3..2808e45 100644
--- a/build.sh
+++ b/build.sh
@@ -1,7 +1,7 @@
 #!/bin/sh
 PN="font-commodore-64"
 VERSION="1"
-RELEASE="1"
+RELEASE="2"
 PRIORITY="0"
 ADVICE=""
 TYPE="public"
@@ -63,6 +63,7 @@ unix2dos $OUT/$PN/CLIENT_DATA/*
 				7z x -o$OUT/$PN/CLIENT_DATA/files /usr/portage/distfiles/$X86FILE
 				cp $OUT/$PN/CLIENT_DATA/files/bin.x86-32/FontReg.exe $OUT/$PN/CLIENT_DATA/files/FontReg32.exe
 				cp $OUT/$PN/CLIENT_DATA/files/bin.x86-64/FontReg.exe $OUT/$PN/CLIENT_DATA/files/FontReg64.exe
+				rm -rf $OUT/$PN/CLIENT_DATA/files/bin.* $OUT/$PN/CLIENT_DATA/files/src
 			else
 				echo "The checksums do not match."
 				exit 1
@@ -89,6 +90,11 @@ unix2dos $OUT/$PN/CLIENT_DATA/*
 				#cp /usr/portage/distfiles/$X86FILE $OUT/$PN/CLIENT_DATA
 				#mkdir -p $OUT/$PN/CLIENT_DATA/files
 				7z e -o$OUT/$PN/CLIENT_DATA/files /usr/portage/distfiles/$X86FILE_1
+				mv "$OUT/$PN/CLIENT_DATA/files/Commodore-64-v622.TTF" "$OUT/$PN/CLIENT_DATA/files/Commodore-64-v622.ttf"
+				mv "$OUT/$PN/CLIENT_DATA/files/Commodore Angled v1-1.ttf" "$OUT/$PN/CLIENT_DATA/files/Commodore-64-Angled.ttf"
+				mv "$OUT/$PN/CLIENT_DATA/files/Commodore Pixeled.ttf" "$OUT/$PN/CLIENT_DATA/files/Commodore-64-Pixeled.ttf"
+				mv "$OUT/$PN/CLIENT_DATA/files/Commodore Rounded v1-1.ttf" "$OUT/$PN/CLIENT_DATA/files/Commodore-64-Rounded.ttf"
+
 			else
 				echo "The checksums do not match."
 				exit 1