diff -urN crosstool-ng-1.16.0/config/kernel/mingw64.in crosstool-ng-1.16.0win64/config/kernel/mingw64.in
--- crosstool-ng-1.16.0/config/kernel/mingw64.in	1970-01-01 01:00:00.000000000 +0100
+++ crosstool-ng-1.16.0win64/config/kernel/mingw64.in	2012-10-21 22:59:43.708325867 +0200
@@ -0,0 +1,33 @@
+# mingw64 config options
+
+## depends on EXPERIMENTAL && ( ARCH_x86 && ARCH_64 )
+##
+## select MINGW64
+##
+## help Build a toolchain targeting systems running Windows as host
+
+choice
+    bool
+    prompt "Windows api version"
+
+# Don't remove next line
+# CT_INSERT_VERSION_BELOW
+config W64API_V_2_0_7
+    bool
+    prompt "2.0.7"
+
+config W64API_V_select
+    bool
+    prompt "Other version"
+
+endchoice
+
+config W64API_VERSION
+    string
+    prompt "W64 api version" if W64API_V_select
+# Don't remove next line
+# CT_INSERT_VERSION_STRING_BELOW
+    default "2.0.7" if W64API_V_2_0_7
+    help
+      Enter the version number of the windows api files to use
+
diff -urN crosstool-ng-1.16.0/config/kernel.in crosstool-ng-1.16.0win64/config/kernel.in
--- crosstool-ng-1.16.0/config/kernel.in	2012-08-04 23:41:28.000000000 +0200
+++ crosstool-ng-1.16.0win64/config/kernel.in	2012-10-21 23:06:31.675797912 +0200
@@ -10,6 +10,9 @@
 config MINGW32
     bool
 
+config MINGW64
+    bool
+
 # Each target OS (aka kernel) that support shared libraries can select
 # this, so the user can decide whether or not to build a shared library
 # enabled toolchain
diff -urN crosstool-ng-1.16.0/config/libc/eglibc.in crosstool-ng-1.16.0win64/config/libc/eglibc.in
--- crosstool-ng-1.16.0/config/libc/eglibc.in	2012-08-04 23:41:28.000000000 +0200
+++ crosstool-ng-1.16.0win64/config/libc/eglibc.in	2012-10-21 21:53:21.905448311 +0200
@@ -1,6 +1,6 @@
 # eglibc options
 
-## depends on ! MINGW32 && ! BARE_METAL && ARCH_USE_MMU
+## depends on ! MINGW32 && ! MINGW64 && ! BARE_METAL && ARCH_USE_MMU
 ##
 ## select LIBC_SUPPORT_NPTL
 ## select LIBC_SUPPORT_LINUXTHREADS
diff -urN crosstool-ng-1.16.0/config/libc/glibc.in crosstool-ng-1.16.0win64/config/libc/glibc.in
--- crosstool-ng-1.16.0/config/libc/glibc.in	2012-08-04 23:41:28.000000000 +0200
+++ crosstool-ng-1.16.0win64/config/libc/glibc.in	2012-10-21 21:54:19.253134414 +0200
@@ -1,6 +1,6 @@
 # glibc options
 
-## depends on ! MINGW32 && ! BARE_METAL && ARCH_USE_MMU
+## depends on ! MINGW32 && ! MINGW64 && ! BARE_METAL && ARCH_USE_MMU
 ##
 ## select LIBC_SUPPORT_NPTL
 ##
diff -urN crosstool-ng-1.16.0/config/libc/mingw64.in crosstool-ng-1.16.0win64/config/libc/mingw64.in
--- crosstool-ng-1.16.0/config/libc/mingw64.in	1970-01-01 01:00:00.000000000 +0100
+++ crosstool-ng-1.16.0win64/config/libc/mingw64.in	2012-10-19 20:35:39.126314117 +0200
@@ -0,0 +1,33 @@
+# mingw64 options
+
+## depends on MINGW64
+##
+## select LIBC_SUPPORT_WIN32THREADS
+##
+## help The de-facto standard for Mingw distributions.
+
+choice
+    bool
+    prompt "Mingw64 runtime version"
+
+# Don't remove next line
+# CT_INSERT_VERSION_BELOW
+config MINGW64RT_V_3_18
+    bool
+    prompt "3.18"
+
+config MINGW64RT_V_select
+    bool
+    prompt "Other version"
+
+endchoice
+
+config MINGW64RT_VERSION
+    string
+    prompt "Mingw64 runtime version" if MINGW64RT_V_select
+# Don't remove next line
+# CT_INSERT_VERSION_STRING_BELOW
+    default "3.18" if MINGW64RT_V_3_18
+    help
+      Enter the version number of the mingw64 runtime files to use
+
diff -urN crosstool-ng-1.16.0/config/libc/mingw64.in.2 crosstool-ng-1.16.0win64/config/libc/mingw64.in.2
--- crosstool-ng-1.16.0/config/libc/mingw64.in.2	1970-01-01 01:00:00.000000000 +0100
+++ crosstool-ng-1.16.0win64/config/libc/mingw64.in.2	2012-10-23 11:16:31.069590088 +0200
@@ -0,0 +1,10 @@
+# Part-2 of mingw C library options: development libraries
+
+config MINGW_DIRECTX
+    bool
+    prompt "Include DirectX development files"
+
+config MINGW_DDK
+    bool
+    prompt "Include DDK development files"
+
diff -urN crosstool-ng-1.16.0/config/libc/uClibc.in crosstool-ng-1.16.0win64/config/libc/uClibc.in
--- crosstool-ng-1.16.0/config/libc/uClibc.in	2012-08-04 23:41:28.000000000 +0200
+++ crosstool-ng-1.16.0win64/config/libc/uClibc.in	2012-10-21 21:54:33.838072664 +0200
@@ -1,6 +1,6 @@
 # uClibc options
 
-## depends on ! MINGW32 && ! BARE_METAL
+## depends on ! MINGW32 && ! MINGW64 && ! BARE_METAL
 ##
 ## select LIBC_SUPPORT_LINUXTHREADS
 ## select LIBC_SUPPORT_THREADS_NONE
