diff --git a/trunk/build.xml b/trunk/build.xml
index 8ea399d6a..30564ffbb 100644
--- a/trunk/build.xml
+++ b/trunk/build.xml
@@ -10,6 +10,7 @@
     <property name="PREFIXFILENAME" value="ffdec"/>
     <property name="JARFILENAME" value="${PREFIXFILENAME}"/>
     <property name="EXEFILENAME" value="${PREFIXFILENAME}"/>
+    <property name="EXE64FILENAME" value="${PREFIXFILENAME}64"/>
     <property name="EXEICON" value="${basedir}/graphics/icon_ffdec_round.ico"/>
     <property name="TARGETJAVA" value="1.7"/>
     <property name="MINJAVAVERSION" value="1.7.0"/>
@@ -20,6 +21,7 @@
     <property name="INNOSETUPPATH" value="c:\program files (x86)\inno setup 5"/>
     <property name="LAUNCH4JPATH" value="c:\program files (x86)\launch4j" />
     <property name="MAXHEAPSIZE" value="1024"/> <!-- MB -->
+    <property name="MAXHEAPSIZE64" value="8192"/> <!-- MB -->
        
     
     <property name="SOURCEDIR" value="${basedir}/src"/>
@@ -47,6 +49,7 @@
     <property name="INSTALLERCONFIG" value="${basedir}/installer.cfg"/>
     <property name="INSTALLERPROJECT" value="${basedir}/installer.iss"/>
     <property name="EXECONFIG" value="${basedir}/build_exe.xml"/>    
+    <property name="EXE64CONFIG" value="${basedir}/build_exe64.xml"/>    
     <property name="RUNPARAMS" value=""/>
 
     <import file="build_common.xml"/>
diff --git a/trunk/build_common.xml b/trunk/build_common.xml
index c91c42294..afaae1604 100644
--- a/trunk/build_common.xml
+++ b/trunk/build_common.xml
@@ -164,6 +164,45 @@
             </launch4jConfig>
         </echoxml>
     </target>
+    <target name="-exe64-config">
+        <echoxml file="${EXE64CONFIG}">
+            <launch4jConfig>
+                <dontWrapJar>true</dontWrapJar>
+                <headerType>gui</headerType>
+                <jar>${JARFILENAME}.jar</jar>
+                <outfile>${DISTRIBUTIONDIR}/${EXE64FILENAME}.exe</outfile>
+                <errTitle></errTitle>
+                <cmdLine></cmdLine>
+                <chdir></chdir>
+                <priority>normal</priority>
+                <downloadUrl>http://java.com/download</downloadUrl>
+                <supportUrl></supportUrl>
+                <customProcName>false</customProcName>
+                <stayAlive>false</stayAlive>
+                <manifest></manifest>
+                <icon>${EXEICON}</icon>
+                <jre>
+                    <path></path>
+                    <minVersion>${MINJAVAVERSION}</minVersion>
+                    <maxVersion></maxVersion>
+                    <jdkPreference>preferJre</jdkPreference>
+                    <maxHeapSize>${MAXHEAPSIZE64}</maxHeapSize>
+                </jre>
+                <versionInfo>
+                    <fileVersion>${VERSIONNUMBER}</fileVersion>
+                    <txtFileVersion>${VERSION}${VERSIONSUFFIX}</txtFileVersion>
+                    <fileDescription>${PRODUCTNAME}</fileDescription>
+                    <copyright>${VENDOR}</copyright>
+                    <productVersion>${VERSIONNUMBER}</productVersion>
+                    <txtProductVersion>${VERSION}${VERSIONSUFFIX}</txtProductVersion>
+                    <productName>${PRODUCTNAME}</productName>
+                    <companyName></companyName>
+                    <internalName>${INTERNALNAME}</internalName>
+                    <originalFilename>${EXE64FILENAME}.exe</originalFilename>
+                </versionInfo>
+            </launch4jConfig>
+        </echoxml>
+    </target>
     <target name="-exe-linux" unless="is_windows" depends="-exe-config">
         <exec dir="${LAUNCH4JPATH}" executable="${LAUNCH4JPATH}/launch4j">
             <arg file="${EXECONFIG}" />
@@ -174,7 +213,12 @@
             <arg file="${EXECONFIG}" />
         </exec>
     </target>
-    <target name="exe" depends="-exe-linux,-exe-windows">
+    <target name="-exe64-windows" if="is_windows" depends="-exe64-config">
+        <exec dir="${LAUNCH4JPATH}" executable="${LAUNCH4JPATH}\launch4jc.exe">
+            <arg file="${EXE64CONFIG}" />
+        </exec>
+    </target>
+    <target name="exe" depends="-exe-linux,-exe-windows,-exe64-windows">
         
     </target>
 
diff --git a/trunk/build_exe64.xml b/trunk/build_exe64.xml
new file mode 100644
index 000000000..a92e12e87
--- /dev/null
+++ b/trunk/build_exe64.xml
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<launch4jConfig>
+  <dontWrapJar>true</dontWrapJar>
+  <headerType>gui</headerType>
+  <jar>ffdec.jar</jar>
+  <outfile>C:\Projectek\ffdec\asdec\trunk/dist/ffdec64.exe</outfile>
+  <errTitle />
+  <cmdLine />
+  <chdir />
+  <priority>normal</priority>
+  <downloadUrl>http://java.com/download</downloadUrl>
+  <supportUrl />
+  <customProcName>false</customProcName>
+  <stayAlive>false</stayAlive>
+  <manifest />
+  <icon>C:\Projectek\ffdec\asdec\trunk/graphics/icon_ffdec_round.ico</icon>
+  <jre>
+    <path />
+    <minVersion>1.7.0</minVersion>
+    <maxVersion />
+    <jdkPreference>preferJre</jdkPreference>
+    <maxHeapSize>8192</maxHeapSize>
+  </jre>
+  <versionInfo>
+    <fileVersion>1.7.4.1</fileVersion>
+    <txtFileVersion>1.7.4u1_fec2956aac20+</txtFileVersion>
+    <fileDescription>JPEXS Free Flash Decompiler</fileDescription>
+    <copyright>JPEXS</copyright>
+    <productVersion>1.7.4.1</productVersion>
+    <txtProductVersion>1.7.4u1_fec2956aac20+</txtProductVersion>
+    <productName>JPEXS Free Flash Decompiler</productName>
+    <companyName />
+    <internalName>FFDec</internalName>
+    <originalFilename>ffdec64.exe</originalFilename>
+  </versionInfo>
+</launch4jConfig>
diff --git a/trunk/installer.iss b/trunk/installer.iss
index 423289449..0771c31cb 100644
--- a/trunk/installer.iss
+++ b/trunk/installer.iss
@@ -36,6 +36,7 @@ Name: "desktopicon"; Description: "{cm:CreateDesktopIcon}"; GroupDescription: "{
 
 [Files]
 Source: "dist\ffdec.exe"; DestDir: "{app}"; Flags: ignoreversion
+Source: "dist\ffdec64.exe"; DestDir: "{app}"; Flags: ignoreversion
 Source: "dist\lib\*"; DestDir: "{app}\lib"; Flags: ignoreversion recursesubdirs createallsubdirs
 Source: "dist\ffdec.bat"; DestDir: "{app}"; Flags: ignoreversion
 Source: "dist\ffdec.jar"; DestDir: "{app}"; Flags: ignoreversion
diff --git a/trunk/src/com/jpexs/decompiler/flash/console/ContextMenuTools.java b/trunk/src/com/jpexs/decompiler/flash/console/ContextMenuTools.java
index 00990c36d..0fb47387b 100644
--- a/trunk/src/com/jpexs/decompiler/flash/console/ContextMenuTools.java
+++ b/trunk/src/com/jpexs/decompiler/flash/console/ContextMenuTools.java
@@ -68,13 +68,26 @@ public class ContextMenuTools {
             return true;
         }
 
+        String exeName32 = "ffdec.exe";
+        String exeName64 = "ffdec64.exe";
+        
+        if (add) {
+            String exeName = Platform.is64Bit() ? exeName64 : exeName32;
+            return addToContextMenu(add, exeName);
+        } else {
+            // remove both 32 and 64 bit references
+            addToContextMenu(add, exeName32);
+            return addToContextMenu(add, exeName64);
+        }
+    }
+    
+    private static boolean addToContextMenu(boolean add, String exeName) {
         final String extensions[] = new String[]{"swf", "gfx"};
 
         final WinReg.HKEY REG_CLASSES_HKEY = WinReg.HKEY_LOCAL_MACHINE;
         final String REG_CLASSES_PATH = "Software\\Classes\\";
 
         String appDir = getAppDir();
-        String exeName = "ffdec.exe";
         String verb = "ffdec";
         String verbName = "Open with FFDec";
         boolean exists;