diff --git a/TrueCrypt_x64_7.1.1.0.r4.msi.sha1sum b/TrueCrypt_x64_7.1.1.0.r4.msi.sha1sum
deleted file mode 100644
index fec84f0..0000000
--- a/TrueCrypt_x64_7.1.1.0.r4.msi.sha1sum
+++ /dev/null
@@ -1 +0,0 @@
-ba306f2e7e1af898ee8644913e64724c256587ea  /home/mario/.opsi-dist-cache/truecrypt.truecrypt-7.1.1.0/X86_64/TrueCrypt_x64_7.1.1.0.r4.msi
diff --git a/TrueCrypt_x64_7.1.1.0.r5.msi.sha1sum b/TrueCrypt_x64_7.1.1.0.r5.msi.sha1sum
new file mode 100644
index 0000000..f9b502d
--- /dev/null
+++ b/TrueCrypt_x64_7.1.1.0.r5.msi.sha1sum
@@ -0,0 +1 @@
+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.r4.msi.sha1sum b/TrueCrypt_x86_7.1.1.0.r4.msi.sha1sum
deleted file mode 100644
index 3c49c6d..0000000
--- a/TrueCrypt_x86_7.1.1.0.r4.msi.sha1sum
+++ /dev/null
@@ -1 +0,0 @@
-be22186674fe775f2e02187986cf7398ef657435  /home/mario/.opsi-dist-cache/truecrypt.truecrypt-7.1.1.0/X86/TrueCrypt_x86_7.1.1.0.r4.msi
diff --git a/TrueCrypt_x86_7.1.1.0.r5.msi.sha1sum b/TrueCrypt_x86_7.1.1.0.r5.msi.sha1sum
new file mode 100644
index 0000000..2bf26eb
--- /dev/null
+++ b/TrueCrypt_x86_7.1.1.0.r5.msi.sha1sum
@@ -0,0 +1 @@
+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 73fc9ff..02fdb50 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="4"
+UVERSION="5"
 VERSION="7.1.1.0"
 RELEASE="3"
 PRIORITY="0"
diff --git a/truecrypt-x64.aip b/truecrypt-x64.aip
index cb773f2..520f394 100644
--- a/truecrypt-x64.aip
+++ b/truecrypt-x64.aip
@@ -4,6 +4,7 @@
     <ROW Property="AI_BITMAP_DISPLAY_MODE" Value="0"/>
     <ROW Property="ALLUSERS" Value="1"/>
     <ROW Property="ARPCOMMENTS" Value="This installer database contains the logic and data required to install [|ProductName]." ValueLocId="*"/>
+    <ROW Property="ARPPRODUCTICON" Value="TrueCrypt.exe" Type="8"/>
     <ROW Property="Manufacturer" Value="TrueCrypt"/>
     <ROW Property="ProductCode" Value="1033:{DC09C81D-FA26-4B8B-BBCC-02923FF9D5FC} " Type="16"/>
     <ROW Property="ProductLanguage" Value="1033"/>
@@ -134,6 +135,9 @@
     <ROW Action="SET_SHORTCUTDIR" Type="307" Source="SHORTCUTDIR" Target="[ProgramMenuFolder][ProductName]"/>
     <ROW Action="SET_TARGETDIR_TO_APPDIR" Type="51" Source="TARGETDIR" Target="[APPDIR]"/>
   </COMPONENT>
+  <COMPONENT cid="caphyon.advinst.msicomp.MsiIconsComponent">
+    <ROW Name="TrueCrypt.exe" SourcePath="TrueCrypt-7.1.a\TrueCrypt.exe" Index="0"/>
+  </COMPONENT>
   <COMPONENT cid="caphyon.advinst.msicomp.MsiInstExSeqComponent">
     <ROW Action="AI_DOWNGRADE" Condition="AI_NEWERPRODUCTFOUND AND (UILevel &lt;&gt; 5)" Sequence="210"/>
     <ROW Action="AI_RESTORE_LOCATION" Condition="APPDIR=&quot;&quot;" Sequence="749"/>
diff --git a/truecrypt-x86.aip b/truecrypt-x86.aip
index 849b529..ca86650 100644
--- a/truecrypt-x86.aip
+++ b/truecrypt-x86.aip
@@ -1,8 +1,10 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<DOCUMENT Type="Advanced Installer" CreateVersion="10.3" version="10.3" Modules="simple" RootPath="." Language="en" Id="{8C0A2ABD-DAC7-4635-8CC1-B4C2431D5B76}">
+<DOCUMENT Type="Advanced Installer" CreateVersion="10.3" version="10.5" Modules="simple" RootPath="." Language="en" Id="{8C0A2ABD-DAC7-4635-8CC1-B4C2431D5B76}">
   <COMPONENT cid="caphyon.advinst.msicomp.MsiPropsComponent">
+    <ROW Property="AI_BITMAP_DISPLAY_MODE" Value="0"/>
     <ROW Property="ALLUSERS" Value="1"/>
     <ROW Property="ARPCOMMENTS" Value="This installer database contains the logic and data required to install [|ProductName]." ValueLocId="*"/>
+    <ROW Property="ARPPRODUCTICON" Value="TrueCrypt.exe" Type="8"/>
     <ROW Property="Manufacturer" Value="TrueCrypt"/>
     <ROW Property="ProductCode" Value="1033:{84888CD7-C251-404E-AF78-E4C37EA0013B} " Type="16"/>
     <ROW Property="ProductLanguage" Value="1033"/>
@@ -13,10 +15,10 @@
     <ROW Property="UpgradeCode" Value="{29590861-525D-4C67-AE8B-CE30E178FEB1}"/>
     <ROW Property="WindowsType9X" MultiBuildValue="DefaultBuild:Windows 9x/ME" ValueLocId="-"/>
     <ROW Property="WindowsType9XDisplay" MultiBuildValue="DefaultBuild:Windows 9x/ME" ValueLocId="-"/>
-    <ROW Property="WindowsTypeNT" MultiBuildValue="DefaultBuild:Windows NT 4.0, Windows NT 4.0 Service Pack 1, Windows NT 4.0 Service Pack 2, Windows NT 4.0 Service Pack 3, Windows NT 4.0 Service Pack 4, Windows NT 4.0 Service Pack 5, Windows NT 4.0 Service Pack 6" ValueLocId="-"/>
-    <ROW Property="WindowsTypeNT64" MultiBuildValue="DefaultBuild:Windows XP/Vista/Windows 7/Windows 8 x64" ValueLocId="-"/>
-    <ROW Property="WindowsTypeNT64Display" MultiBuildValue="DefaultBuild:Windows XP/Vista/Windows 7/Windows 8 x64" ValueLocId="-"/>
-    <ROW Property="WindowsTypeNTDisplay" MultiBuildValue="DefaultBuild:Windows NT 4.0" ValueLocId="-"/>
+    <ROW Property="WindowsTypeNT40" MultiBuildValue="DefaultBuild:Windows NT 4.0" ValueLocId="-"/>
+    <ROW Property="WindowsTypeNT40Display" MultiBuildValue="DefaultBuild:Windows NT 4.0" ValueLocId="-"/>
+    <ROW Property="WindowsTypeNT64" MultiBuildValue="DefaultBuild:Windows XP/Vista/Windows 7/Windows 8 x64/Windows 8.1 x64" ValueLocId="-"/>
+    <ROW Property="WindowsTypeNT64Display" MultiBuildValue="DefaultBuild:Windows XP/Vista/Windows 7/Windows 8 x64/Windows 8.1 x64" ValueLocId="-"/>
   </COMPONENT>
   <COMPONENT cid="caphyon.advinst.msicomp.MsiDirsComponent">
     <ROW Directory="APPDIR" Directory_Parent="TARGETDIR" DefaultDir="APPDIR:." IsPseudoRoot="1"/>
@@ -87,7 +89,6 @@
   <COMPONENT cid="caphyon.advinst.msicomp.MsiControlComponent">
     <ROW Dialog_="LicenseAgreementDlg" Control="AgreementText" Type="ScrollableText" X="20" Y="60" Width="330" Height="120" Attributes="7" Text="TrueCrypt-License.rtf" Order="400" TextLocId="Control.Text.LicenseAgreementDlg#AgreementText_2" MsiKey="LicenseAgreementDlg#AgreementText"/>
     <ROW Dialog_="ReadmeDlg" Control="ReadmeText" Type="ScrollableText" X="20" Y="60" Width="330" Height="150" Attributes="7" Text="Truecrypt-geosOne-ReadMe.rtf" Order="400" TextLocId="Control.Text.ReadmeDlg#ReadmeText" MsiKey="ReadmeDlg#ReadmeText"/>
-    <ATTRIBUTE name="FixedSizeBitmaps" value="2"/>
   </COMPONENT>
   <COMPONENT cid="caphyon.advinst.msicomp.MsiControlEventComponent">
     <ROW Dialog_="WelcomeDlg" Control_="Next" Event="NewDialog" Argument="LicenseAgreementDlg" Condition="AI_INSTALL" Ordering="1"/>
@@ -122,6 +123,7 @@
   </COMPONENT>
   <COMPONENT cid="caphyon.advinst.msicomp.MsiCustActComponent">
     <ROW Action="AI_DOWNGRADE" Type="19" Target="4010"/>
+    <ROW Action="AI_DpiContentScale" Type="1" Source="aicustact.dll" Target="DpiContentScale"/>
     <ROW Action="AI_InstallModeCheck" Type="1" Source="aicustact.dll" Target="UpdateInstallMode" WithoutSeq="true"/>
     <ROW Action="AI_PREPARE_UPGRADE" Type="65" Source="aicustact.dll" Target="PrepareUpgrade"/>
     <ROW Action="AI_RESTORE_LOCATION" Type="65" Source="aicustact.dll" Target="RestoreLocation"/>
@@ -133,6 +135,9 @@
     <ROW Action="SET_SHORTCUTDIR" Type="307" Source="SHORTCUTDIR" Target="[ProgramMenuFolder][ProductName]"/>
     <ROW Action="SET_TARGETDIR_TO_APPDIR" Type="51" Source="TARGETDIR" Target="[APPDIR]"/>
   </COMPONENT>
+  <COMPONENT cid="caphyon.advinst.msicomp.MsiIconsComponent">
+    <ROW Name="TrueCrypt.exe" SourcePath="TrueCrypt-7.1.a\TrueCrypt.exe" Index="0"/>
+  </COMPONENT>
   <COMPONENT cid="caphyon.advinst.msicomp.MsiInstExSeqComponent">
     <ROW Action="AI_DOWNGRADE" Condition="AI_NEWERPRODUCTFOUND AND (UILevel &lt;&gt; 5)" Sequence="210"/>
     <ROW Action="AI_RESTORE_LOCATION" Condition="APPDIR=&quot;&quot;" Sequence="749"/>
@@ -143,12 +148,13 @@
   </COMPONENT>
   <COMPONENT cid="caphyon.advinst.msicomp.MsiInstallUISequenceComponent">
     <ROW Action="AI_RESTORE_LOCATION" Condition="APPDIR=&quot;&quot;" Sequence="749"/>
-    <ROW Action="AI_ResolveKnownFolders" Sequence="52"/>
-    <ROW Action="AI_ResolveLocalizedCredentials" Sequence="51"/>
+    <ROW Action="AI_ResolveKnownFolders" Sequence="53"/>
+    <ROW Action="AI_ResolveLocalizedCredentials" Sequence="52"/>
+    <ROW Action="AI_DpiContentScale" Sequence="51"/>
   </COMPONENT>
   <COMPONENT cid="caphyon.advinst.msicomp.MsiLaunchConditionsComponent">
     <ROW Condition="( Version9X OR (VersionNT AND (NOT VersionNT64)) )" Description="[ProductName] cannot be installed on [WindowsTypeNT64Display]" DescriptionLocId="AI.LaunchCondition.NoNT64" IsPredefined="true" Builds="DefaultBuild"/>
-    <ROW Condition="( Version9X OR VersionNT64 OR ( VersionNT AND ((VersionNT &lt;&gt; 400) OR ((VersionNT = 400) AND (ServicePackLevel &gt;= 1))) AND ((VersionNT &lt;&gt; 400) OR ((VersionNT = 400) AND (ServicePackLevel &lt;&gt; 1))) AND ((VersionNT &lt;&gt; 400) OR ((VersionNT = 400) AND (ServicePackLevel &lt;&gt; 2))) AND ((VersionNT &lt;&gt; 400) OR ((VersionNT = 400) AND (ServicePackLevel &lt;&gt; 3))) AND ((VersionNT &lt;&gt; 400) OR ((VersionNT = 400) AND (ServicePackLevel &lt;&gt; 4))) AND ((VersionNT &lt;&gt; 400) OR ((VersionNT = 400) AND (ServicePackLevel &lt;&gt; 5))) AND ((VersionNT &lt;&gt; 400) OR ((VersionNT = 400) AND (ServicePackLevel &lt;&gt; 6))) ) )" Description="[ProductName] cannot be installed on the following Windows versions: [WindowsTypeNTDisplay]" DescriptionLocId="AI.LaunchCondition.NoSpecificNT" IsPredefined="true" Builds="DefaultBuild"/>
+    <ROW Condition="(VersionNT &lt;&gt; 400)" Description="[ProductName] cannot be installed on the following Windows versions: [WindowsTypeNT40Display]" DescriptionLocId="AI.LaunchCondition.NoNT40" IsPredefined="true" Builds="DefaultBuild"/>
     <ROW Condition="VersionNT" Description="[ProductName] cannot be installed on [WindowsType9XDisplay]" DescriptionLocId="AI.LaunchCondition.No9X" IsPredefined="true" Builds="DefaultBuild"/>
   </COMPONENT>
   <COMPONENT cid="caphyon.advinst.msicomp.MsiRegsComponent">