diff --git a/Makefile b/Makefile
index 1e12d33345..d1c7a4bdb0 100644
--- a/Makefile
+++ b/Makefile
@@ -111,12 +111,18 @@ ffplay.o: ffplay.c
 videohook: .libs
 	$(MAKE) -C vhook all
 
+.PHONY: install
+
 install: all install-man $(INSTALLVHOOK)
 	$(MAKE) -C libavcodec install
 	$(MAKE) -C libavformat install
 	install -d $(prefix)/bin
 	install -c -s -m 755 $(PROG) $(prefix)/bin
 
+# create the window installer
+wininstaller: all install
+	makensis ffinstall.nsi
+
 # install man from source dir if available
 install-man:
 	if [ -f $(SRC_PATH)/doc/ffmpeg.1 ] ; then \
diff --git a/ffinstall.nsi b/ffinstall.nsi
new file mode 100644
index 0000000000..6082bb056b
--- /dev/null
+++ b/ffinstall.nsi
@@ -0,0 +1,75 @@
+;NSIS Script For FFmpeg
+
+;Title Of Your Application
+Name "FFmpeg"
+CompletedText "FFmpeg install completed! Enjoy your meal!"
+
+; do a CRC check
+CRCCheck On
+
+; output file name
+OutFile "FFinstall.exe"
+
+; license page introduction
+LicenseText "You must agree to this license before installing."
+
+; license data
+LicenseData ".\COPYING"
+
+; the default installation directory
+InstallDir "$PROGRAMFILES\FFmpeg"
+
+;The text to prompt the user to enter a directory
+DirText "Please select the folder below"
+
+Section "Install"
+  ;Install Files
+  SetOutPath $INSTDIR
+  SetCompress Auto
+  SetOverwrite IfNewer
+  File "C:\Program Files\FFmpeg\bin\ffmpeg.exe"
+  File "C:\Program Files\FFmpeg\bin\SDL.dll"
+  File "C:\Program Files\FFmpeg\bin\ffplay.exe"
+  File ".\COPYING"
+  File ".\CREDITS"
+  
+  ; documentation
+  SetOutPath $INSTDIR\doc
+  File ".\doc\faq.html"
+  File ".\doc\ffmpeg-doc.html"
+  File ".\doc\ffplay-doc.html"
+
+  ; Write the uninstall keys for Windows
+  WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\FFmpeg" "DisplayName" "FFmpeg (remove only)"
+  WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\FFmpeg" "UninstallString" "$INSTDIR\Uninst.exe"
+WriteUninstaller "Uninst.exe"
+SectionEnd
+
+Section "Shortcuts"
+  ;Add Shortcuts
+SectionEnd
+
+UninstallText "This will uninstall FFmpeg from your system"
+
+Section Uninstall
+  ; delete files
+  Delete "$INSTDIR\ffmpeg.exe"
+  Delete "$INSTDIR\SDL.dll"
+  Delete "$INSTDIR\ffplay.exe"
+  Delete "$INSTDIR\COPYING"
+  Delete "$INSTDIR\CREDITS"
+  
+  ; delete documentation
+  Delete "$INSTDIR\doc\faq.html"
+  Delete "$INSTDIR\ffmpeg-doc.html"
+  Delete "$INSTDIR\doc\ffplay-doc.html"
+
+  RMDir /r $INSTDIR\doc
+
+  ; delete uninstaller and unistall registry entries
+  Delete "$INSTDIR\Uninst.exe"
+  DeleteRegKey HKEY_LOCAL_MACHINE "SOFTWARE\FFmpeg"
+  DeleteRegKey HKEY_LOCAL_MACHINE "SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\FFmpeg"
+  RMDir "$INSTDIR"
+SectionEnd
+