diff --git a/packaging/windows/install icon.ico b/packaging/windows/install icon.ico
new file mode 100644
index 000000000..53a20dcf3
Binary files /dev/null and b/packaging/windows/install icon.ico differ
diff --git a/packaging/windows/olive.nsi b/packaging/windows/olive.nsi
new file mode 100644
index 000000000..a9607e5e4
--- /dev/null
+++ b/packaging/windows/olive.nsi
@@ -0,0 +1,77 @@
+!include "MUI.nsh"
+
+!define MUI_ICON "install icon.ico"
+!define MUI_UNICON "uninstall icon.ico"
+
+!define APP_NAME "Olive"
+!define APP_TARGET "olive-editor"
+
+!define MUI_FINISHPAGE_RUN "$INSTDIR\olive-editor.exe"
+
+SetCompressor lzma
+
+Name ${APP_NAME}
+
+
+!ifdef X64
+OutFile "olive-w64i.exe"
+InstallDir "$PROGRAMFILES64\${APP_NAME}"
+!else
+OutFile "olive-w32i.exe"
+InstallDir "$PROGRAMFILES32\${APP_NAME}"
+!endif
+
+!insertmacro MUI_PAGE_WELCOME
+!insertmacro MUI_PAGE_LICENSE gpl-3.0.txt
+!insertmacro MUI_PAGE_DIRECTORY
+!insertmacro MUI_PAGE_COMPONENTS
+!insertmacro MUI_PAGE_INSTFILES
+
+!define MUI_FINISHPAGE_NOAUTOCLOSE
+!define MUI_FINISHPAGE_RUN_TEXT "Run ${APP_NAME}"
+!define MUI_FINISHPAGE_RUN_FUNCTION "LaunchOlive"
+!insertmacro MUI_PAGE_FINISH
+
+!insertmacro MUI_LANGUAGE "English"
+
+Section "Olive (required)"
+	
+	SectionIn RO
+
+	SetOutPath $INSTDIR
+
+!ifdef X64
+	File /r olive-w64\*
+!else
+	File /r olive-w32\*
+!endif
+
+	WriteUninstaller "$INSTDIR\uninstall.exe"
+
+SectionEnd
+
+Section "Create Desktop shortcut"
+	CreateShortCut "$DESKTOP\${APP_NAME}.lnk" "$INSTDIR\${APP_TARGET}.exe"
+SectionEnd
+
+Section "Create Start Menu shortcut"
+	CreateDirectory "$SMPROGRAMS\${APP_NAME}"
+	CreateShortCut "$SMPROGRAMS\${APP_NAME}\${APP_NAME}.lnk" "$INSTDIR\${APP_TARGET}.exe"
+	CreateShortCut "$SMPROGRAMS\${APP_NAME}\Uninstall ${APP_NAME}.lnk" "$INSTDIR\uninstall.exe"
+SectionEnd
+
+UninstPage uninstConfirm
+UninstPage instfiles
+
+Section "uninstall"
+
+	rmdir /r "$INSTDIR"
+
+	Delete "$DESKTOP\${APP_NAME}.lnk"
+	rmdir /r "$SMPROGRAMS\${APP_NAME}"
+
+SectionEnd
+
+Function LaunchOlive
+	ExecShell "" "$INSTDIR\${APP_TARGET}.exe"
+FunctionEnd
\ No newline at end of file
diff --git a/packaging/windows/uninstall icon.ico b/packaging/windows/uninstall icon.ico
new file mode 100644
index 000000000..7030c0755
Binary files /dev/null and b/packaging/windows/uninstall icon.ico differ