diff --git a/builders/windows-builder.py b/builders/windows-builder.py
index fbc658c..4defe06 100644
--- a/builders/windows-builder.py
+++ b/builders/windows-builder.py
@@ -216,7 +216,7 @@ class WindowsBuilder(Builder):
         self._print_verbose('... Building PortableApps Installer')
         self._run_command([self.portableinstaller_exe, self.portable_dest_path],
                           'Error running PortableApps Installer')
-        portable_exe_name = 'OpenLPPortable_%s.paf.exe' % self.portable_version
+        portable_exe_name = 'OpenLPPortable_{ver}-{arch}.paf.exe'.format(ver=self.portable_version, arch=self.arch)
         portable_exe_path = os.path.abspath(os.path.join(self.portable_dest_path, '..', portable_exe_name))
         self._print_verbose('... Portable Build: {}'.format(portable_exe_path))
         if os.path.exists(portable_exe_path):
diff --git a/windows/OpenLP.iss.default b/windows/OpenLP.iss.default
index 688fc34..0543626 100644
--- a/windows/OpenLP.iss.default
+++ b/windows/OpenLP.iss.default
@@ -7,7 +7,7 @@
 #define AppPublisher "OpenLP Developers"
 #define AppURL "http://openlp.org/"
 #define AppExeName "OpenLP.exe"
-#define Arch "%(arch)"
+#define Arch "%(arch)s"
 
 #define FileHandle FileOpen("%(branch)s\dist\OpenLP\.version")
 #define FileLine FileRead(FileHandle)
@@ -87,6 +87,7 @@ Filename: {app}\{#AppExeName}; Description: {cm:LaunchProgram,{#AppName}}; Flags
 
 [Registry]
 Root: HKCR; Subkey: .osz; ValueType: string; ValueName: ; ValueData: OpenLP; Flags: uninsdeletevalue
+Root: HKCR; Subkey: .oszl; ValueType: string; ValueName: ; ValueData: OpenLP; Flags: uninsdeletevalue
 Root: HKCR; Subkey: OpenLP; ValueType: string; ValueName: ; ValueData: OpenLP Service; Flags: uninsdeletekey
 Root: HKCR; Subkey: OpenLP\DefaultIcon; ValueType: string; ValueName: ; ValueData: {app}\OpenLP.exe,0
 Root: HKCR; Subkey: OpenLP\shell\open\command; ValueType: string; ValueName: ; ValueData: """{app}\OpenLP.exe"" ""%1"""
diff --git a/windows/appinfo.ini.default b/windows/appinfo.ini.default
index 8bb12c3..238e6ac 100644
--- a/windows/appinfo.ini.default
+++ b/windows/appinfo.ini.default
@@ -19,7 +19,7 @@ CommercialUse=true
 
 [Version]
 DisplayVersion=%(display_version)s-%(arch)s
-PackageVersion=%(package_version)s-%(arch)s
+PackageVersion=%(package_version)s
 
 [Control]
 Icons=1
@@ -27,6 +27,8 @@ Start=OpenLPPortable.exe
 
 [Associations]
 FileType=osz
+FileType=oszl
 
 [FileTypeIcons]
 osz=app
+oszl=app