diff --git a/TrueCrypt_x64_7.1.1.0.r5.msi.sha1sum b/TrueCrypt_x64_7.1.1.0.r5.msi.sha1sum
deleted file mode 100644
index f9b502d..0000000
--- a/TrueCrypt_x64_7.1.1.0.r5.msi.sha1sum
+++ /dev/null
@@ -1 +0,0 @@
-57e85800baf03a6f7ff6ee2f0b0521a6b7d8b36a  /home/mario/.opsi-dist-cache/truecrypt.truecrypt-7.1.1.0/X86_64/TrueCrypt_x64_7.1.1.0.r5.msi
diff --git a/TrueCrypt_x86_7.1.1.0.r5.msi.sha1sum b/TrueCrypt_x86_7.1.1.0.r5.msi.sha1sum
deleted file mode 100644
index 2bf26eb..0000000
--- a/TrueCrypt_x86_7.1.1.0.r5.msi.sha1sum
+++ /dev/null
@@ -1 +0,0 @@
-d099a20d8714b6b6f1e7baf24791acf380168bd8  /home/mario/.opsi-dist-cache/truecrypt.truecrypt-7.1.1.0/X86/TrueCrypt_x86_7.1.1.0.r5.msi
diff --git a/builder-product.cfg b/builder-product.cfg
index 02fdb50..2102586 100644
--- a/builder-product.cfg
+++ b/builder-product.cfg
@@ -5,7 +5,7 @@ VENDOR="truecrypt.org"
 PN="truecrypt.truecrypt"
 NAME="TrueCrypt"
 DESCRIPTION="Free open-source disk encryption software for Windows."
-UVERSION="5"
+UVERSION="6"
 VERSION="7.1.1.0"
 RELEASE="3"
 PRIORITY="0"
diff --git a/truecrypt-x64.aip b/truecrypt-x64.aip
index 520f394..110000d 100644
--- a/truecrypt-x64.aip
+++ b/truecrypt-x64.aip
@@ -44,7 +44,7 @@
     <ROW Component="__2" ComponentId="{639673A0-43BF-4B3C-9369-9FE612E3798C}" Directory_="APPDIR" Attributes="4" KeyPath="__2"/>
     <ROW Component="__3" ComponentId="{D8379EFC-667E-41D3-B0B7-8216E807EBCD}" Directory_="APPDIR" Attributes="4" KeyPath="__3"/>
     <ROW Component="open" ComponentId="{1384018C-75CC-41F3-B609-6E07EFC6E56E}" Directory_="APPDIR" Attributes="4" KeyPath="open"/>
-    <ROW Component="truecryptx64.sys" ComponentId="{1A6AB7EB-9A66-4AB6-97BA-AB7EF5B0E784}" Directory_="DRIVERSFOLDER" Attributes="256" KeyPath="truecryptx64.sys" Type="0"/>
+    <ROW Component="truecryptx64.sys" ComponentId="{5E862494-0686-4C28-8D88-CAD2C3137EB2}" Directory_="DRIVERSFOLDER" Attributes="256" KeyPath="truecryptx64.sys" Type="0"/>
   </COMPONENT>
   <COMPONENT cid="caphyon.advinst.msicomp.MsiFeatsComponent">
     <ROW Feature="Driver" Title="TrueCrypt Driver" Display="2" Level="1" Directory_="APPDIR" Attributes="0" Components="RegistryEntries"/>
@@ -52,12 +52,12 @@
     <ATTRIBUTE name="CurrentFeature" value="MainFeature"/>
   </COMPONENT>
   <COMPONENT cid="caphyon.advinst.msicomp.MsiFilesComponent">
-    <ROW File="Language.de.xml" Component_="TrueCryptUserGuide.pdf" FileName="Langua~1.xml|Language.de.xml" Attributes="0" SourcePath="langpack-de-1.0.1-for-truecrypt-7.1a\Language.de.xml" SelfReg="false"/>
+    <ROW File="Language.de.xml" Component_="TrueCryptUserGuide.pdf" FileName="Langua~1.xml|Language.de.xml" Attributes="0" SourcePath="langpack-de-1.0.1-for-truecrypt-7.1a\Language.de.xml" SelfReg="false" NextFile="truecryptx64.sys"/>
     <ROW File="License.txt" Component_="License.txt" FileName="License.txt" Attributes="0" SourcePath="TrueCrypt-7.1.a\License.txt" SelfReg="false" NextFile="TrueCrypt.exe"/>
     <ROW File="TrueCrypt.exe" Component_="TrueCrypt.exe" FileName="TrueCr~1.exe|TrueCrypt.exe" Attributes="0" SourcePath="TrueCrypt-7.1.a\TrueCrypt.exe" SelfReg="false" NextFile="TrueCryptFormat.exe" DigSign="true"/>
-    <ROW File="TrueCryptFormat.exe" Component_="TrueCryptFormat.exe" FileName="TrueCr~2.exe|TrueCrypt Format.exe" Attributes="0" SourcePath="TrueCrypt-7.1.a\TrueCrypt Format.exe" SelfReg="false" NextFile="truecryptx64.sys" DigSign="true"/>
+    <ROW File="TrueCryptFormat.exe" Component_="TrueCryptFormat.exe" FileName="TrueCr~2.exe|TrueCrypt Format.exe" Attributes="0" SourcePath="TrueCrypt-7.1.a\TrueCrypt Format.exe" SelfReg="false" NextFile="Language.de.xml" DigSign="true"/>
     <ROW File="TrueCryptUserGuide.pdf" Component_="TrueCryptUserGuide.pdf" FileName="TrueCr~1.pdf|TrueCrypt User Guide.pdf" Attributes="0" SourcePath="TrueCrypt-7.1.a\TrueCrypt User Guide.pdf" SelfReg="false" NextFile="License.txt"/>
-    <ROW File="truecryptx64.sys" Component_="truecryptx64.sys" FileName="truecr~2.sys|truecrypt.sys" Attributes="0" SourcePath="TrueCrypt-7.1.a\truecrypt-x64.sys" SelfReg="false" NextFile="Language.de.xml"/>
+    <ROW File="truecryptx64.sys" Component_="truecryptx64.sys" FileName="truecr~1.sys|truecrypt-x64.sys" Attributes="0" SourcePath="TrueCrypt-7.1.a\truecrypt-x64.sys" SelfReg="false"/>
   </COMPONENT>
   <COMPONENT cid="caphyon.advinst.msicomp.BuildComponent">
     <ROW BuildKey="DefaultBuild" BuildName="DefaultBuild" BuildOrder="1" BuildType="0" PackageFileName="[|ProductName]_x64_[|ProductVersion]" Languages="en" InstallationType="4" UseLargeSchema="true" MsiPackageType="x64"/>
@@ -165,13 +165,13 @@
     <ROW Registry="_" Root="0" Key=".tc" Value="TrueCryptVolume" Component_="_"/>
     <ROW Registry="__1" Root="0" Key="TrueCryptVolume" Value="TrueCrypt Volume" Component_="__1"/>
     <ROW Registry="__2" Root="0" Key="TrueCryptVolume\DefaultIcon" Value="[APPDIR]\TrueCrypt.exe,1" Component_="__2"/>
-    <ROW Registry="__3" Root="0" Key="TrueCryptVolume\Shell\open\command" Value="&quot;[APPDIR]\TrueCrypt.exe&quot; /v &quot;%1&quot;" Component_="__3"/>
+    <ROW Registry="__3" Root="0" Key="TrueCryptVolume\Shell\open\command" Value="&quot;[APPDIR]TrueCrypt.exe&quot; /v &quot;%1&quot;" Component_="__3"/>
     <ROW Registry="open" Root="0" Key="TrueCryptVolume\Shell\open" Name="+" Component_="open"/>
     <ROW Registry="reg090B89827BCC890BD3804FADA096A80D" Root="2" Key="SYSTEM\CurrentControlSet\services\truecrypt" Name="Start" Value="#00000001" Component_="RegistryEntries"/>
     <ROW Registry="reg56DC911C73516220E99A398C3F1FAE0F" Root="2" Key="SYSTEM\CurrentControlSet\services\truecrypt" Name="Type" Value="#00000001" Component_="RegistryEntries"/>
     <ROW Registry="reg70F3CDE6C997F7EF10F9971994B15AC6" Root="2" Key="SYSTEM\CurrentControlSet\services\truecrypt" Name="*" Component_="RegistryEntries"/>
     <ROW Registry="regE0FD439926EC1D6CF1D26CA865662B39" Root="2" Key="SYSTEM\CurrentControlSet\services\truecrypt" Name="ErrorControl" Value="#00000001" Component_="RegistryEntries"/>
-    <ROW Registry="regF01C28298E4DE3F31C3826D95B5861F9" Root="2" Key="SYSTEM\CurrentControlSet\services\truecrypt" Name="ImagePath" Value="#%[DRIVERSFOLDER]\truecrypt.sys" Component_="RegistryEntries"/>
+    <ROW Registry="regF01C28298E4DE3F31C3826D95B5861F9" Root="2" Key="SYSTEM\CurrentControlSet\services\truecrypt" Name="ImagePath" Value="#%[DRIVERSFOLDER]truecrypt-x64.sys" Component_="RegistryEntries"/>
     <ROW Registry="regF1670050CC4ED3AE9B34EC57200F7A1F" Root="2" Key="SYSTEM\CurrentControlSet\services\truecrypt" Name="DisplayName" Value="truecrypt" Component_="RegistryEntries"/>
   </COMPONENT>
   <COMPONENT cid="caphyon.advinst.msicomp.MsiShortsComponent">
diff --git a/truecrypt-x86.aip b/truecrypt-x86.aip
index ca86650..bbfc172 100644
--- a/truecrypt-x86.aip
+++ b/truecrypt-x86.aip
@@ -165,13 +165,13 @@
     <ROW Registry="_" Root="0" Key=".tc" Value="TrueCryptVolume" Component_="_"/>
     <ROW Registry="__1" Root="0" Key="TrueCryptVolume" Value="TrueCrypt Volume" Component_="__1"/>
     <ROW Registry="__2" Root="0" Key="TrueCryptVolume\DefaultIcon" Value="[APPDIR]\TrueCrypt.exe,1" Component_="__2"/>
-    <ROW Registry="__3" Root="0" Key="TrueCryptVolume\Shell\open\command" Value="&quot;[APPDIR]\TrueCrypt.exe&quot; /v &quot;%1&quot;" Component_="__3"/>
+    <ROW Registry="__3" Root="0" Key="TrueCryptVolume\Shell\open\command" Value="&quot;[APPDIR]TrueCrypt.exe&quot; /v &quot;%1&quot;" Component_="__3"/>
     <ROW Registry="open" Root="0" Key="TrueCryptVolume\Shell\open" Name="+" Component_="open"/>
     <ROW Registry="reg090B89827BCC890BD3804FADA096A80D" Root="2" Key="SYSTEM\CurrentControlSet\services\truecrypt" Name="Start" Value="#00000001" Component_="RegistryEntries"/>
     <ROW Registry="reg56DC911C73516220E99A398C3F1FAE0F" Root="2" Key="SYSTEM\CurrentControlSet\services\truecrypt" Name="Type" Value="#00000001" Component_="RegistryEntries"/>
     <ROW Registry="reg70F3CDE6C997F7EF10F9971994B15AC6" Root="2" Key="SYSTEM\CurrentControlSet\services\truecrypt" Name="*" Component_="RegistryEntries"/>
     <ROW Registry="regE0FD439926EC1D6CF1D26CA865662B39" Root="2" Key="SYSTEM\CurrentControlSet\services\truecrypt" Name="ErrorControl" Value="#00000001" Component_="RegistryEntries"/>
-    <ROW Registry="regF01C28298E4DE3F31C3826D95B5861F9" Root="2" Key="SYSTEM\CurrentControlSet\services\truecrypt" Name="ImagePath" Value="#%[DRIVERSFOLDER]\truecrypt.sys" Component_="RegistryEntries"/>
+    <ROW Registry="regF01C28298E4DE3F31C3826D95B5861F9" Root="2" Key="SYSTEM\CurrentControlSet\services\truecrypt" Name="ImagePath" Value="#%[DRIVERSFOLDER]truecrypt.sys" Component_="RegistryEntries"/>
     <ROW Registry="regF1670050CC4ED3AE9B34EC57200F7A1F" Root="2" Key="SYSTEM\CurrentControlSet\services\truecrypt" Name="DisplayName" Value="truecrypt" Component_="RegistryEntries"/>
   </COMPONENT>
   <COMPONENT cid="caphyon.advinst.msicomp.MsiShortsComponent">