diff --git a/build_common.xml b/build_common.xml
index c1b03b151..f8bb31cac 100644
--- a/build_common.xml
+++ b/build_common.xml
@@ -144,6 +144,7 @@
             <define name="APP_PUBLISHER" value="${VENDOR}"/>
             <define name="APP_URL" value="${PRODUCTURL}"/>
             <define name="APP_SETUPFILE" value="${exe.file}" />
+            <define name="JRE_VERSION" value="${TARGETJAVA}" />
         </nsis>
         <echo level="info" message="Setup created in ${exe.file}"/>
     </target>
diff --git a/installer.nsi b/installer.nsi
index 43ff16ee4..f2baa76d6 100644
--- a/installer.nsi
+++ b/installer.nsi
@@ -13,8 +13,20 @@
 ;!define APP_URL "http://www.free-decompiler.com/flash/"
 ;!define APP_PUBLISHER "JPEXS"
 ;!define APP_NAME "JPEXS Free Flash Decompiler"
+;!define JRE_VERSION "1.7"
 
 
+!addplugindir "nsis_plugins\ansi\"
+;!addplugindir "nsis_plugins\unicode\"
+
+
+SetCompressor /SOLID lzma
+!define JRE_URL "http://javadl.sun.com/webapps/download/AutoDL?BundleId=52252"
+!include "nsis_plugins\JREDyna_Inetc.nsh"
+
+!define FLASH_URL "http://download.macromedia.com/pub/flashplayer/current/support/install_flash_player_ax.exe"
+!include "nsis_plugins\Flash_Inetc.nsh"
+!include x64.nsh
 
 
 !define APP_SHORTVERNAME "JPEXS FFDec v. ${APP_VER}"
@@ -25,10 +37,10 @@
 !define MUI_HEADERIMAGE_BITMAP "graphics\installer_150x57.bmp"
 
 !define APP_UNINSTKEY "{E618D276-6596-41F4-8A98-447D442A77DB}_is1"
-SetCompressor /SOLID lzma
 
-!addplugindir nsis_plugins/ansi/
-!addplugindir nsis_plugins/unicode/
+
+
+
 
   ;Name and file
   Name "${APP_SHORTVERNAME}"
@@ -88,29 +100,7 @@ Function GetInstalledSize
 	Push $GetInstalledSize.total
 FunctionEnd
 
-
-
-Function IsFlashInstalled
-  Push $R0
-  ClearErrors
-  ReadRegStr $R0 HKCR "CLSID\{D27CDB6E-AE6D-11cf-96B8-444553540000}\InprocServer32" ""
-  IfErrors lbl_na
-    IfFileExists $R0 0 lbl_na
-      StrCpy $R0 1
-  Goto lbl_end
-  lbl_na:
-    StrCpy $R0 0
-  lbl_end:
-  Exch $R0
- FunctionEnd
  
-!define IsFlashInstalled "!insertmacro IsFlashInstalled"
- 
-!macro IsFlashInstalled ResultVar
-  Call IsFlashInstalled
-  Pop "${ResultVar}"
-!macroend
-
 
 !define StrLoc "!insertmacro StrLoc"
  
@@ -366,6 +356,8 @@ IntOp ${Var} $0 - $1
   !insertmacro MUI_PAGE_LICENSE "resources/license.txt"
   !insertmacro MUI_PAGE_COMPONENTS
   !insertmacro MUI_PAGE_DIRECTORY
+  !insertmacro CUSTOM_PAGE_JREINFO
+  !insertmacro CUSTOM_PAGE_FLASHINFO
 
 var SMDir
 
@@ -463,10 +455,12 @@ Section "FFDec" SecDummy
   ${GetTime} "" "L" $0 $1 $2 $3 $4 $5 $6
   WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${APP_UNINSTKEY}" "InstallDate" "$2$1$0"
 
-
   ;Create un1installer
   WriteUninstaller "$INSTDIR\Uninstall.exe"
 
+  call DownloadAndInstallJREIfNecessary
+  call DownloadAndInstallFlashIfNecessary
+
 SectionEnd
 
 
diff --git a/nsis_plugins/Flash_Inetc.nsh b/nsis_plugins/Flash_Inetc.nsh
new file mode 100644
index 000000000..984f60b06
--- /dev/null
+++ b/nsis_plugins/Flash_Inetc.nsh
@@ -0,0 +1,110 @@
+; Version 1.0.0
+; by JPEXS from JREDyna template
+  
+  !include "WordFunc.nsh"
+  !include "x64.nsh"
+
+
+  !macro CUSTOM_PAGE_FLASHINFO
+    Page custom CUSTOM_PAGE_FLASHINFO
+  !macroend
+
+  !ifndef FLASH_URL
+    !error "FLASH_URL must be defined"
+  !endif
+
+
+;;;;;;;;;;;;;;;;;;;;;
+;  Custom panel
+;;;;;;;;;;;;;;;;;;;;;
+
+Function CUSTOM_PAGE_FLASHINFO
+  
+  SetRegView 32
+  ClearErrors
+  ReadRegStr $R0 HKCR "CLSID\{D27CDB6E-AE6D-11cf-96B8-444553540000}" ""
+  IfErrors 0 exit     
+  
+  nsDialogs::create /NOUNLOAD 1018
+  pop $1
+
+
+  !insertmacro MUI_HEADER_TEXT "Flash Player ActiveX control required" "This application requires Flash ActiveX control"
+  ${NSD_CreateLabel} 0 0 100% 100% "This application requires installation of the Flash ActiveX control. This will be downloaded and installed as part of the installation."
+  pop $1
+  goto ShowDialog
+
+ShowDialog:
+
+  nsDialogs::Show
+
+exit:
+
+FunctionEnd
+
+
+
+
+Function DownloadAndInstallFlashIfNecessary
+  Push $0
+  Push $1
+
+  DetailPrint "Detecting Flash ActiveX"
+  SetRegView 32
+  ClearErrors
+  ReadRegStr $R0 HKCR "CLSID\{D27CDB6E-AE6D-11cf-96B8-444553540000}" ""
+  IfErrors downloadFlash 
+  DetailPrint "Flash ActiveX already installed"   
+  Goto End
+
+downloadFlash:
+  DetailPrint "Result: Flash Active X is missing."
+  DetailPrint "About to download Flash from ${FLASH_URL}"
+  Inetc::get "${FLASH_URL}" "$TEMP\flash_ax_setup.exe" /END
+  Pop $0 # return value = exit code, "OK" if OK
+  DetailPrint "Download result = $0"
+
+  strcmp $0 "OK" downloadsuccessful
+  MessageBox MB_OK "There was a problem downloading required component - Error: $0"
+  abort
+downloadsuccessful:
+
+
+  DetailPrint "Launching Flash setup"
+  
+  IfSilent doSilent
+  ExecWait '"$TEMP\flash_ax_setup.exe"' $0
+  goto flashSetupfinished
+doSilent:
+  ExecWait '"$TEMP\flash_ax_setup.exe" -install' $0
+  
+
+flashSetupFinished:
+  DetailPrint "Flash Setup finished"
+  Delete "$TEMP\flash_ax_setup.exe"
+  StrCmp $0 "0" InstallVerif 0
+  Push "The Flash setup has been abnormally interrupted - return code $0"
+  Goto ExitInstallFlash
+ 
+InstallVerif:
+  DetailPrint "Checking the Flash Setup's outcome"
+  SetRegView 32
+  ClearErrors
+  ReadRegStr $R0 HKCR "CLSID\{D27CDB6E-AE6D-11cf-96B8-444553540000}" ""
+  IfErrors 0 ExitInstallFlash 
+  Push "Unable to find Flash ActiveX, even though the Flash setup was successful$\n$\n$1"
+  Goto ExitInstallFlash
+  
+ExitInstallFlash:
+  Pop $1
+  MessageBox MB_OK "Unable to install Flash ActiveX - Setup will be aborted$\n$\n$1"
+  Pop $1 	; Restore $1
+  Pop $0 	; Restore $0
+  Abort
+End:
+  Pop $1	; Restore $1
+  Pop $0	; Restore $0
+
+FunctionEnd
+
+  
\ No newline at end of file
diff --git a/nsis_plugins/JREDyna_Inetc.nsh b/nsis_plugins/JREDyna_Inetc.nsh
new file mode 100644
index 000000000..ac70e743c
--- /dev/null
+++ b/nsis_plugins/JREDyna_Inetc.nsh
@@ -0,0 +1,256 @@
+; Version 1.0.1
+
+;JPEXS : Added 64 bit support
+
+
+  !ifndef JRE_DECLARES
+  !define JRE_DECLARES
+
+  !include "WordFunc.nsh"
+  !include "x64.nsh"
+
+
+  !macro CUSTOM_PAGE_JREINFO
+    Page custom CUSTOM_PAGE_JREINFO
+  !macroend
+
+  !ifndef JRE_VERSION
+    !error "JRE_VERSION must be defined"
+  !endif
+
+  !ifndef JRE_URL
+    !error "JRE_URL must be defined"
+  !endif
+
+
+;;;;;;;;;;;;;;;;;;;;;
+;  Custom panel
+;;;;;;;;;;;;;;;;;;;;;
+
+Function CUSTOM_PAGE_JREINFO
+
+  push $0
+  push $1
+  push $2
+  
+  
+  Push "${JRE_VERSION}"
+  Call DetectJRE
+  Pop $0
+  Pop $1
+  StrCmp $0 "OK" exit
+
+  nsDialogs::create /NOUNLOAD 1018
+  pop $1
+
+  StrCmp $0 "0" NoFound
+  StrCmp $0 "-1" FoundOld
+
+
+NoFound:
+  !insertmacro MUI_HEADER_TEXT "JRE Installation Required" "This application requires Java ${JRE_VERSION} or higher"
+  ${NSD_CreateLabel} 0 0 100% 100% "This application requires installation of the Java Runtime Environment. This will be downloaded and installed as part of the installation."
+  pop $1
+  goto ShowDialog
+
+FoundOld:
+  !insertmacro MUI_HEADER_TEXT "JRE Update Required" "This application requires Java ${JRE_VERSION} or higher"
+  ${NSD_CreateLabel} 0 0 100% 100% "This application requires a more recent version of the Java Runtime Environment. This will be downloaded and installed as part of the installation."
+  pop $1
+  goto ShowDialog
+
+ShowDialog:
+
+  nsDialogs::Show
+
+exit:
+
+
+  pop $2
+  pop $1
+  pop $0
+
+FunctionEnd
+
+
+
+
+
+; Checks to ensure that the installed version of the JRE (if any) is at least that of
+; the JRE_VERSION variable.  The JRE will be downloaded and installed if necessary
+; The full path of java.exe will be returned on the stack
+
+Function DownloadAndInstallJREIfNecessary
+  Push $0
+  Push $1
+
+  DetailPrint "Detecting JRE Version"
+  Push "${JRE_VERSION}"
+  Call DetectJRE
+  Pop $0	; Get return value from stack
+  Pop $1	; get JRE path (or error message)
+  DetailPrint "JRE Version detection complete - result = $1"
+
+
+  strcmp $0 "OK" End downloadJRE
+
+downloadJRE:
+  DetailPrint "About to download JRE from ${JRE_URL}"
+  Inetc::get "${JRE_URL}" "$TEMP\jre_Setup.exe" /END
+  Pop $0 # return value = exit code, "OK" if OK
+  DetailPrint "Download result = $0"
+
+  strcmp $0 "OK" downloadsuccessful
+  MessageBox MB_OK "There was a problem downloading required component - Error: $0"
+  abort
+downloadsuccessful:
+
+
+  DetailPrint "Launching JRE setup"
+  
+  IfSilent doSilent
+  ExecWait '"$TEMP\jre_setup.exe" /passive REBOOT=Suppress JAVAUPDATE=0 WEBSTARTICON=0 /L \"$TEMP\jre_setup.log\"' $0
+  goto jreSetupfinished
+doSilent:
+  ExecWait '"$TEMP\jre_setup.exe" /S REBOOT=Suppress JAVAUPDATE=0 WEBSTARTICON=0 /L \"$TEMP\jre_setup.log\"' $0
+  
+
+jreSetupFinished:
+  DetailPrint "JRE Setup finished"
+  Delete "$TEMP\jre_setup.exe"
+  StrCmp $0 "0" InstallVerif 0
+  Push "The JRE setup has been abnormally interrupted - return code $0"
+  Goto ExitInstallJRE
+ 
+InstallVerif:
+  DetailPrint "Checking the JRE Setup's outcome"
+  Push "${JRE_VERSION}"
+  Call DetectJRE  
+  Pop $0	  ; DetectJRE's return value
+  Pop $1	  ; JRE home (or error message if compatible JRE could not be found)
+  StrCmp $0 "OK" 0 JavaVerStillWrong
+  Goto JREPathStorage
+JavaVerStillWrong:
+  Push "Unable to find JRE with version above ${JRE_VERSION}, even though the JRE setup was successful$\n$\n$1"
+  Goto ExitInstallJRE
+ 
+JREPathStorage:
+  push $0	; => rv, r1, r0
+  exch 2	; => r0, r1, rv
+  exch		; => r1, r0, rv
+  Goto End
+ 
+ExitInstallJRE:
+  Pop $1
+  MessageBox MB_OK "Unable to install Java - Setup will be aborted$\n$\n$1"
+  Pop $1 	; Restore $1
+  Pop $0 	; Restore $0
+  Abort
+End:
+  Pop $1	; Restore $1
+  Pop $0	; Restore $0
+
+FunctionEnd
+
+
+; DetectJRE
+; Inputs:  Minimum JRE version requested on stack (this value will be overwritten)
+; Outputs: Returns two values on the stack: 
+;     First value (rv0):  0 - JRE not found. -1 - JRE found but too old. OK - JRE found and meets version criteria
+;     Second value (rv1):  Problem description.  Otherwise - Path to the java runtime (javaw.exe will be at .\bin\java.exe relative to this path)
+ 
+Function DetectJRE
+
+  Exch $0	; Get version requested  
+		; Now the previous value of $0 is on the stack, and the asked for version of JDK is in $0
+  Push $1	; $1 = Java version string (ie 1.5.0)
+  Push $2	; $2 = Javahome
+  Push $3	; $3 = holds the version comparison result
+
+		; stack is now:  r3, r2, r1, r0
+;DetectJRE64:
+  SetRegView 64
+  ; first, check for an installed JRE
+  ReadRegStr $1 HKLM "SOFTWARE\JavaSoft\Java Runtime Environment" "CurrentVersion"
+  StrCmp $1 "" DetectJDK64
+  ReadRegStr $2 HKLM "SOFTWARE\JavaSoft\Java Runtime Environment\$1" "JavaHome"
+  StrCmp $2 "" DetectJDK64
+  Goto GetJRE
+ 
+DetectJDK64:
+  SetRegView 64
+  ; next, check for an installed JDK
+  ReadRegStr $1 HKLM "SOFTWARE\JavaSoft\Java Development Kit" "CurrentVersion"
+  StrCmp $1 "" DetectJRE
+  ReadRegStr $2 HKLM "SOFTWARE\JavaSoft\Java Development Kit\$1" "JavaHome"
+  StrCmp $2 "" DetectJRE
+  Goto GetJRE
+
+DetectJRE:
+  SetRegView 32
+; first, check for an installed JRE
+  ReadRegStr $1 HKLM "SOFTWARE\JavaSoft\Java Runtime Environment" "CurrentVersion"
+  StrCmp $1 "" DetectJDK
+  ReadRegStr $2 HKLM "SOFTWARE\JavaSoft\Java Runtime Environment\$1" "JavaHome"
+  StrCmp $2 "" DetectJDK
+  Goto GetJRE
+
+
+DetectJDK:
+  SetRegView 32
+  ; next, check for an installed JDK
+  ReadRegStr $1 HKLM "SOFTWARE\JavaSoft\Java Development Kit" "CurrentVersion"
+  StrCmp $1 "" NoFound
+  ReadRegStr $2 HKLM "SOFTWARE\JavaSoft\Java Development Kit\$1" "JavaHome"
+  StrCmp $2 "" NoFound
+  Goto GetJRE
+
+
+GetJRE:
+  SetRegView 32
+  ; ok, we found a JRE, let's compare it's version and make sure it is new enough
+; $0 = version requested. $1 = version found. $2 = javaHome
+  IfFileExists "$2\bin\java.exe" 0 NoFound
+
+  ${VersionCompare} $0 $1 $3 ; $3 now contains the result of the comparison
+  DetailPrint "Comparing version $0 to $1 results in $3"
+  intcmp $3 1 FoundOld
+  goto FoundNew
+ 
+NoFound:
+  ; No JRE found
+  strcpy $0 "0"
+  strcpy $1 "No JRE Found"
+  Goto DetectJREEnd
+ 
+FoundOld:
+  ; An old JRE was found
+  strcpy $0 "-1"
+  strcpy $1 "Old JRE found"
+  Goto DetectJREEnd  
+FoundNew:
+  ; A suitable JRE was found 
+  strcpy $0 "OK"
+  strcpy $1 $2
+  Goto DetectJREEnd
+
+DetectJREEnd:
+        SetRegView 32
+	; at this stage, $0 contains rv0, $1 contains rv1
+	; now, straighten the stack out and recover original values for r0, r1, r2 and r3
+	; there are two return values: rv0 = -1, 0, OK and rv1 = JRE path or problem description
+	; stack looks like this: 
+                ;    r3,r2,r1,r0
+	Pop $3	; => r2,r1,r0
+	Pop $2	; => r1,r0
+	Push $0 ; => rv0, r1, r0
+	Exch 2	; => r0, r1, rv0
+	Push $1 ; => rv1, r0, r1, rv0
+	Exch 2	; => r1, r0, rv1, rv0
+	Pop $1	; => r0, rv1, rv0
+	Pop $0	; => rv1, rv0	
+	Exch	; => rv0, rv1
+
+
+FunctionEnd
+  !endif ; // JRE_DECLARES
\ No newline at end of file