diff --git a/gitso/trunk/Gitso.py b/gitso/trunk/Gitso.py
index 18d54b1..5043d89 100644
--- a/gitso/trunk/Gitso.py
+++ b/gitso/trunk/Gitso.py
@@ -176,13 +176,13 @@ class Connect(wx.Frame):
                 if sys.platform == 'darwin':
                     self.returnPID = os.spawnl(os.P_NOWAIT, '%sOSXvnc/OSXvnc-server' % devPath, 'OSXvnc-server', '-nopw -connectHost', '%s' % host)
                 elif sys.platform.find('linux') != -1:
-                    self.returnPID = os.spawnlp(os.P_NOWAIT, 'x11vnc', 'x11vnc', '-ncache 20 -solid black -connect' , '%s' % host)
+                    self.returnPID = os.spawnlp(os.P_NOWAIT, 'x11vnc', 'x11vnc', '-nopw -ncache 20 -solid black -connect' , '%s' % host)
                 elif sys.platform == 'win32':
-                    self.returnPID = os.spawnl(os.P_NOWAIT, 'c:\\windows\\WinVNC.exe', 'c:\\windows\\WinVNC.exe')
+                    self.returnPID = os.spawnl(os.P_NOWAIT, '%s\\WinVNC.exe' % os.environ['WINDIR'], '%s\\WinVNC.exe' % os.environ['WINDIR'])
                     print "Launched WinVNC.exe, waiting to run -connect command..."
                     import time
                     time.sleep(3)
-                    self.returnPID = os.spawnl(os.P_NOWAIT, 'c:\\windows\\WinVNC.exe', 'c:\\windows\\WinVNC.exe', '-connect', '%s' % host)
+                    self.returnPID = os.spawnl(os.P_NOWAIT, '%s\\WinVNC.exe' % os.environ['WINDIR'], '%s\\WinVNC.exe' % os.environ['WINDIR'], '-connect', '%s' % host)
 
                 else:
                     print 'platform not detected'
@@ -206,9 +206,10 @@ class Connect(wx.Frame):
                     self.connectButton.Enable(True)
                     self.stopButton.Enable(False)
             elif sys.platform.find('linux') != -1:
-                self.returnPID = os.spawnlp(os.P_NOWAIT, 'vncviewer', 'vncviewer', '-listen')
+                self.returnPID = os.spawnlp(os.P_NOWAIT, 'vncviewer', 'vncviewer', '-listen')                
             elif sys.platform == 'win32':
-                self.returnPID = os.spawnl(os.P_NOWAIT, 'c:\\windows\\vncviewer.exe', 'c:\\windows\\vncviewer.exe', '-listen' )
+                print 'Launching %s\\vncviewer.exe' % os.environ['WINDIR']
+                self.returnPID = os.spawnl(os.P_NOWAIT, "%s\\vncviewer.exe" % os.environ['WINDIR'], '%s\\vncviewer.exe' % os.environ['WINDIR'], '-listen' )
             else:
                 print 'platform not detected'
 
diff --git a/gitso/trunk/arch/win32/VNCHooks.dll b/gitso/trunk/arch/win32/VNCHooks.dll
new file mode 100644
index 0000000..84920f4
Binary files /dev/null and b/gitso/trunk/arch/win32/VNCHooks.dll differ
diff --git a/gitso/trunk/arch/win32/WinVNC.exe b/gitso/trunk/arch/win32/WinVNC.exe
new file mode 100644
index 0000000..0bd9e10
Binary files /dev/null and b/gitso/trunk/arch/win32/WinVNC.exe differ
diff --git a/gitso/trunk/arch/win32/vncviewer.exe b/gitso/trunk/arch/win32/vncviewer.exe
new file mode 100644
index 0000000..5bb6637
Binary files /dev/null and b/gitso/trunk/arch/win32/vncviewer.exe differ
diff --git a/gitso/trunk/makegitso.nsi b/gitso/trunk/makegitso.nsi
new file mode 100644
index 0000000..26c4cac
--- /dev/null
+++ b/gitso/trunk/makegitso.nsi
@@ -0,0 +1,71 @@
+; gitso.nsi
+; ----------------
+; written by Derek Buranen (xburnerx@gmail.com) & Aaron Gerber
+; 
+; Install Gitso in Windows using NSIS
+;--------------------------------
+
+!define VERSION "0.5" 
+Name "Gitso ${VERSION}"
+Icon "icon.ico"
+UninstallIcon "icon.ico"
+OutFile "gitso-install.exe"
+
+; The default installation directory
+InstallDir $PROGRAMFILES\Gitso
+; Registry key to check for directory (so if you install again, it will overwrite the old one automatically)
+InstallDirRegKey HKLM "Software\Gitso" "Install_Dir"
+
+;--------------------------------
+; Version Information
+  VIProductVersion "0.0.0.0"
+  VIAddVersionKey "ProductName" "Gitso"
+  VIAddVersionKey "Comments" "Gitso is to support others"
+  VIAddVersionKey "CompanyName" "http://code.google.com/p/gitso"
+  VIAddVersionKey "LegalCopyright" "GPL"
+  VIAddVersionKey "FileDescription" "Gitso"
+  VIAddVersionKey "FileVersion" "${VERSION}"
+;--------------------------------
+
+;--------------------------------
+; Pages
+Page components
+Page directory
+Page instfiles
+
+UninstPage uninstConfirm
+UninstPage instfiles
+;--------------------------------
+
+Section "Gitso"
+  SectionIn RO
+  SetOutPath $INSTALLDIR
+  ;need to add gitso's exe file here after created with py2exe or something like it
+  SetOutPath $WINDIR
+  File ".\arch\win32\vncviewer.exe"
+  File ".\arch\win32\WinVNC.exe"
+  File ".\arch\win32\VNCHooks.dll"
+SectionEnd
+
+
+; Uninstall
+;------------------------------------------------------
+Section "Uninstall"
+  ; Remove registry keys
+  DeleteRegKey HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\RMTT"
+  DeleteRegKey HKLM SOFTWARE\RMTT
+  ; Remove files and uninstaller
+  Delete $WINDIR\revealer.dll
+  Delete $WINDIR\revealer.exe
+  Delete $WINDIR\Startup.exe
+  Delete $WINDIR\VNCHooks.dll
+  Delete $WINDIR\WinVNC.exe
+  RMDir /r $INSTDIR
+  Delete $INSTDIR\uninstall.exe
+  Delete "$DESKTOP\RMTT.lnk"
+  Delete "$WINDIR\Tasks\Spyware Scan.job"
+  ; Remove shortcuts and folder
+  RMDir /r "$SMPROGRAMS\RMTT"
+  RMDir "$INSTDIR"
+SectionEnd
+