diff --git a/Makefile b/Makefile
index a40d65ccdb..b145e81b78 100644
--- a/Makefile
+++ b/Makefile
@@ -397,7 +397,9 @@ endif
 	echo -e $(BUILD_MSG) "zip"
 	mkdir -p pkg
 	cd $(OUTPUT) && \
-	7z a ../../../../$(STATUS_CLIENT_ZIP) *
+	#7z a ../../../../$(STATUS_CLIENT_ZIP) *
+	iscc status.iss
+
 
 pkg: $(PKG_TARGET)
 
diff --git a/scripts/windows_build_setup.ps1 b/scripts/windows_build_setup.ps1
index 10ea5595e2..e27ef95eff 100644
--- a/scripts/windows_build_setup.ps1
+++ b/scripts/windows_build_setup.ps1
@@ -15,7 +15,7 @@ function Install-Scoop {
 # Install Git and other dependencies
 function Install-Dependencies {
     Write-Host "Installing dependencies..."
-    scoop install --global 7zip git dos2unix findutils wget make cmake gcc go rcedit
+    scoop install --global 7zip git dos2unix findutils wget make cmake gcc go rcedit inno-setup
     scoop bucket add extras
     scoop install --global vcredist2017
 }
diff --git a/status.iss b/status.iss
new file mode 100644
index 0000000000..42ca68d4fa
--- /dev/null
+++ b/status.iss
@@ -0,0 +1,56 @@
+#define   Name       "Status"
+#define   Version    "0.0.1"
+#define   Publisher  "Status.im"
+#define   URL        "https://status.im"
+#define   ExeName    "Status.exe"
+
+[Setup]
+
+; Generated from Tools -> Generate GUID
+AppId={{F3E2EDB6-78E8-4539-9C8B-A78F059D8647}}
+
+AppName={#Name}
+AppVersion={#Version}
+AppPublisher={#Publisher}
+AppPublisherURL={#URL}
+AppSupportURL={#URL}
+AppUpdatesURL={#URL}
+
+; Defalut install path
+DefaultDirName={pf}\{#Name}
+
+DefaultGroupName={#Name}
+
+; output dir for installer
+OutputDir=.
+OutputBaseFileName=status-setup
+
+; Icon file
+SetupIconFile=resources\status.ico
+
+; Compression
+Compression=lzma
+SolidCompression=yes
+
+;[Languages] - if needed
+;Name: "english"; MessagesFile: "compiler:Default.isl"; LicenseFile: "License_ENG.txt"
+;Name: "russian"; MessagesFile: "compiler:Languages\Russian.isl"; LicenseFile: "License_RUS.txt"
+
+[Files]
+
+; Path to exe on 
+Source: "Status.exe"; DestDir: "{app}"; Flags: ignoreversion
+
+; Resources
+Source: "bin\Status.exe"; DestDir: "{app}\bin"; Flags: ignoreversion recursesubdirs createallsubdirs
+
+Source: "resources\*"; DestDir: "{app}\resources"; Flags: ignoreversion recursesubdirs createallsubdirs
+
+Source: "vendor\*"; DestDir: "{app}\vendor"; Flags: ignoreversion recursesubdirs createallsubdirs
+
+
+[Registry]
+Root: HKCU; Subkey: "Software\Classes\status-im"; ValueType: "string"; ValueData: "URL:status-im protocol"; Flags: uninsdeletekey
+Root: HKCU; Subkey: "Software\Classes\status-im"; ValueType: "string"; ValueName: "URL Protocol"; ValueData: ""
+Root: HKCU; Subkey: "Software\Classes\status-im\DefaultIcon"; ValueType: "string"; ValueData: "{app}\Status.exe,1"
+Root: HKCU; Subkey: "Software\Classes\status-im\shell\open\command"; ValueType: "string"; ValueData: """{app}\Status.exe"" "--url="%1"""
\ No newline at end of file