diff --git a/osx/macosx-builder.py b/osx/macosx-builder.py
index 1243be0..77ac71a 100644
--- a/osx/macosx-builder.py
+++ b/osx/macosx-builder.py
@@ -330,6 +330,7 @@ class MacosxBuilder(object):
                '--noupx',
                '--additional-hooks-dir', self.hooks_path,
                '--runtime-hook', os.path.join(self.hooks_path, 'rthook_openlp_pyqt4.py'),
+               '--runtime-hook', os.path.join(self.hooks_path, 'rthook_ssl.py'),
                '-i', self.mac_icon,
                '-p', self.work_path,
                '-n', 'OpenLP',
diff --git a/windows/OpenLP-2.0.iss.default b/windows/OpenLP-2.0.iss.default
index 290c8cf..215a9bb 100644
--- a/windows/OpenLP-2.0.iss.default
+++ b/windows/OpenLP-2.0.iss.default
@@ -3,6 +3,7 @@
 
 #define AppName "OpenLP"
 #define AppVerName "OpenLP %(display_version)s"
+#define AppVersion "%(display_version)s"
 #define AppPublisher "OpenLP Developers"
 #define AppURL "http://openlp.org/"
 #define AppExeName "OpenLP.exe"
@@ -18,7 +19,8 @@
 ; (To generate a new GUID, click Tools | Generate GUID inside the IDE.)
 AppID={{AA7699FA-B2D2-43F4-8A70-D497D03C9485}
 AppName={#AppName}
-AppVerName={#AppVerName}
+AppVerName={cm:NameAndVersion,{#AppName},{#AppVersion}}
+AppVersion={#AppVersion}
 AppPublisher={#AppPublisher}
 AppPublisherURL={#AppURL}
 AppSupportURL={#AppURL}
@@ -32,6 +34,7 @@ OutputBaseFilename=OpenLP-{#RealVersion}-setup
 Compression=lzma/Max
 SolidCompression=true
 SetupIconFile=OpenLP.ico
+VersionInfoVersion={#AppVersion}
 WizardImageFile=WizImageBig.bmp
 WizardSmallImageFile=WizImageSmall.bmp
 ChangesAssociations=true