diff --git a/TrueCrypt_x64_7.1.1.0.r2.msi.sha1sum b/TrueCrypt_x64_7.1.1.0.r2.msi.sha1sum
deleted file mode 100644
index 7fc39db..0000000
--- a/TrueCrypt_x64_7.1.1.0.r2.msi.sha1sum
+++ /dev/null
@@ -1 +0,0 @@
-99c8547df14cace0e8c5f0efbffc9ea5f9fe6b9f  /home/mario/.opsi-dist-cache/truecrypt.truecrypt-7.1.1.0/X86_64/TrueCrypt_x64_7.1.1.0.r2.msi
diff --git a/TrueCrypt_x64_7.1.1.0.r3.msi.sha1sum b/TrueCrypt_x64_7.1.1.0.r3.msi.sha1sum
new file mode 100644
index 0000000..019889e
--- /dev/null
+++ b/TrueCrypt_x64_7.1.1.0.r3.msi.sha1sum
@@ -0,0 +1 @@
+b7bde66235a38d61598a367ad72c1aaaa6d99ab0  /home/mario/.opsi-dist-cache/truecrypt.truecrypt-7.1.1.0/X86_64/TrueCrypt_x64_7.1.1.0.r3.msi
diff --git a/TrueCrypt_x86_7.1.1.0.r2.msi.sha1sum b/TrueCrypt_x86_7.1.1.0.r2.msi.sha1sum
deleted file mode 100644
index cdee8d9..0000000
--- a/TrueCrypt_x86_7.1.1.0.r2.msi.sha1sum
+++ /dev/null
@@ -1 +0,0 @@
-f9d965de9166f89bfb65038fc021e61dc511ea36  /home/mario/.opsi-dist-cache/truecrypt.truecrypt-7.1.1.0/X86/TrueCrypt_x86_7.1.1.0.r2.msi
diff --git a/TrueCrypt_x86_7.1.1.0.r3.msi.sha1sum b/TrueCrypt_x86_7.1.1.0.r3.msi.sha1sum
new file mode 100644
index 0000000..99bfc79
--- /dev/null
+++ b/TrueCrypt_x86_7.1.1.0.r3.msi.sha1sum
@@ -0,0 +1 @@
+a5345bbceb991ec10ae52c3bbf69fe0b789b5a42  /home/mario/.opsi-dist-cache/truecrypt.truecrypt-7.1.1.0/X86/TrueCrypt_x86_7.1.1.0.r3.msi
diff --git a/builder-product.cfg b/builder-product.cfg
index 3a2c59b..e2904c6 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="2"
+UVERSION="3"
 VERSION="7.1.1.0"
 RELEASE="3"
 PRIORITY="0"
diff --git a/truecrypt-x64.aip b/truecrypt-x64.aip
index 638edc9..49999b3 100644
--- a/truecrypt-x64.aip
+++ b/truecrypt-x64.aip
@@ -162,7 +162,7 @@
     <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="#%SysWOW64\Drivers\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">
diff --git a/truecrypt-x86.aip b/truecrypt-x86.aip
index 6936d12..849b529 100644
--- a/truecrypt-x86.aip
+++ b/truecrypt-x86.aip
@@ -165,7 +165,7 @@
     <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="#%System32\drivers\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">