diff --git a/doc/Changelog.html b/doc/Changelog.html
index bd47146e..900b0384 100644
--- a/doc/Changelog.html
+++ b/doc/Changelog.html
@@ -87,7 +87,9 @@
Fixed the location of temporary intermediate files for SoX-based audio effects
Enabled the "built-in" resampler for QAAC encoder
The "Algorithm Quality" slider now also effects the QAAC encoder
+Added "AVX" (Advanced Vector Extensions) to CPU feature detection code
Updated Opus encoder/decoder libraries to v1.1.2 and Opus-Tools to v0.1.9 (2016-01-12)
+Updated LAME encoder to v3.100 Alpha-2 (2016-01-29), compiled with ICL 15.0 and MSVC 12.0
Updated MediaInfo to v0.7.82 (2016-01-27), compiled with ICL 15.0 and MSVC 12.0
Updated QAAC add-in to the to QAAC v2.58 (2016-01-05)
Updated FhgAacEnc add-in to "Case" edition (2015-10-24)
diff --git a/doc/Changelog.md b/doc/Changelog.md
index ed8a5867..a1b460de 100644
--- a/doc/Changelog.md
+++ b/doc/Changelog.md
@@ -7,7 +7,9 @@
* Fixed the location of temporary intermediate files for SoX-based audio effects
* Enabled the "built-in" resampler for QAAC encoder
* The "Algorithm Quality" slider now also effects the QAAC encoder
+* Added "AVX" (Advanced Vector Extensions) to CPU feature detection code
* Updated Opus encoder/decoder libraries to v1.1.2 and Opus-Tools to v0.1.9 (2016-01-12)
+* Updated LAME encoder to v3.100 Alpha-2 (2016-01-29), compiled with ICL 15.0 and MSVC 12.0
* Updated MediaInfo to v0.7.82 (2016-01-27), compiled with ICL 15.0 and MSVC 12.0
* Updated QAAC add-in to the to QAAC v2.58 (2016-01-05)
* Updated FhgAacEnc add-in to "Case" edition (2015-10-24)
diff --git a/res/Tools_Encd_A.qrc b/res/Tools_Encd_A.qrc
index 394a107a..5a94678d 100644
--- a/res/Tools_Encd_A.qrc
+++ b/res/Tools_Encd_A.qrc
@@ -4,7 +4,9 @@
tools/aften.i386.exe
tools/aften.sse2.exe
tools/aften.x64.exe
- tools/lame.i386.exe
- tools/lame.sse2.exe
+ tools/lame.x64-avx.exe
+ tools/lame.x64-sse2.exe
+ tools/lame.x86-i386.exe
+ tools/lame.x86-sse2.exe
diff --git a/res/tools/lame.i386.exe b/res/tools/lame.i386.exe
deleted file mode 100644
index 4a9bf923..00000000
Binary files a/res/tools/lame.i386.exe and /dev/null differ
diff --git a/res/tools/lame.sse2.exe b/res/tools/lame.sse2.exe
deleted file mode 100644
index 64037d68..00000000
Binary files a/res/tools/lame.sse2.exe and /dev/null differ
diff --git a/res/tools/lame.x64-avx.exe b/res/tools/lame.x64-avx.exe
new file mode 100644
index 00000000..bed71ddd
Binary files /dev/null and b/res/tools/lame.x64-avx.exe differ
diff --git a/res/tools/lame.x64-sse2.exe b/res/tools/lame.x64-sse2.exe
new file mode 100644
index 00000000..40c10cd7
Binary files /dev/null and b/res/tools/lame.x64-sse2.exe differ
diff --git a/res/tools/lame.x86-i386.exe b/res/tools/lame.x86-i386.exe
new file mode 100644
index 00000000..f528630d
Binary files /dev/null and b/res/tools/lame.x86-i386.exe differ
diff --git a/res/tools/lame.x86-sse2.exe b/res/tools/lame.x86-sse2.exe
new file mode 100644
index 00000000..001400ea
Binary files /dev/null and b/res/tools/lame.x86-sse2.exe differ
diff --git a/src/Config.h b/src/Config.h
index 5bd86871..e1487fb3 100644
--- a/src/Config.h
+++ b/src/Config.h
@@ -34,8 +34,8 @@
#define VER_LAMEXP_MINOR_HI 1
#define VER_LAMEXP_MINOR_LO 4
#define VER_LAMEXP_TYPE Alpha
-#define VER_LAMEXP_PATCH 5
-#define VER_LAMEXP_BUILD 1870
+#define VER_LAMEXP_PATCH 6
+#define VER_LAMEXP_BUILD 1872
#define VER_LAMEXP_CONFG 1818
///////////////////////////////////////////////////////////////////////////////
diff --git a/src/Dialog_About.cpp b/src/Dialog_About.cpp
index c57c8d1a..3f141af4 100644
--- a/src/Dialog_About.cpp
+++ b/src/Dialog_About.cpp
@@ -678,7 +678,7 @@ void AboutDialog::initSoftwareTab(void)
moreAboutText += makeToolText
(
tr("LAME - OpenSource mp3 Encoder"),
- "lame.exe", "v?.??, #-?",
+ "lame.exe", "v?.???, #-?",
tr("Released under the terms of the GNU Lesser General Public License."),
"http://lame.sourceforge.net/"
);
diff --git a/src/Tools.h b/src/Tools.h
index 55da5bbc..9fbd634e 100644
--- a/src/Tools.h
+++ b/src/Tools.h
@@ -39,8 +39,10 @@
#define CPU_TYPE_X64_AVX 0x00000020UL //x64, with AVX support
/* combined CPU types */
+#define CPU_TYPE_X86_NVX (CPU_TYPE_X86_GEN|CPU_TYPE_X86_SSE)
#define CPU_TYPE_X86_SSX (CPU_TYPE_X86_SSE|CPU_TYPE_X86_AVX)
#define CPU_TYPE_X86_ALL (CPU_TYPE_X86_GEN|CPU_TYPE_X86_SSX)
+#define CPU_TYPE_X64_NVX (CPU_TYPE_X64_GEN|CPU_TYPE_X64_SSE)
#define CPU_TYPE_X64_SSX (CPU_TYPE_X64_SSE|CPU_TYPE_X64_AVX)
#define CPU_TYPE_X64_ALL (CPU_TYPE_X64_GEN|CPU_TYPE_X64_SSX)
#define CPU_TYPE_ALL_GEN (CPU_TYPE_X86_GEN|CPU_TYPE_X64_GEN)
@@ -74,8 +76,10 @@ g_lamexp_tools[] =
{"68e08fc34f981d183f243308791b5e158c28903a2052ca239bb9ad3d54d976c9ec7f0bb0b50c0aadfcefb4a1d0f63a18", CPU_TYPE_X64_ALL, "flac.x64.exe" , 131, ""},
{"9d2008d06b731b0d88377e9b2ceda30826ee787fe09ae8ef98084d5ef80655199e5069672366314b67a4285b56a282f0", CPU_TYPE_ALL_ALL, "gpgv.exe", 1419, ""},
{"c66992384b6388a7b68f2659624c150b33ff1cacb0c28c0ab2a3249eca4c31e204953f325403f78c077d1735b275ac12", CPU_TYPE_ALL_ALL, "keyring.gpg", UINT_MAX, ""},
- {"53cfab3896a47d48f523315f475fa07856d468ad1aefcc8cce19c18cdf509e2f92840dab92a442995df36d941cb7a6ca", CPU_TYPE_ALL_GEN, "lame.i386.exe", 3995, "Final"},
- {"9511e7ef2ad10de05386eedf7f14d637edab894a53dacd2f8f15c6f8ed582f12c25fb5bf88438e62c46b8eb92e7634b2", CPU_TYPE_ALL_SSX, "lame.sse2.exe", 3995, "Final"},
+ {"1dd342ca0aaaa5f84afbf657991d9829fbb4a2794fee36cd60014e1b9028120a8d3577b8a031482e207c4dd266c6b4c3", CPU_TYPE_X86_GEN, "lame.x86-i386.exe", 31002, "Alpha"},
+ {"afb30a68e12ab2647f9694eb51d3b22d0f3cef95deda811c714556203dcc0adbe4b18c406c6af67b0d4af09f5033c77b", CPU_TYPE_X86_SSX, "lame.x86-sse2.exe", 31002, "Alpha"},
+ {"84b66be0c17ff9b642fdb7f04f26c6621381a02b6297d17b36c9c6afa308b72f1dacb3831b41affe56db6b7fb5dbe9ae", CPU_TYPE_X64_NVX, "lame.x64-sse2.exe", 31002, "Alpha" },
+ {"7c8ff93f3c3d89abd36770066c6f2b44f4aecc672e24406991f4035720a42aee2838b4625f9838e088ba05e3cda42d77", CPU_TYPE_X64_AVX, "lame.x64-avx.exe", 31002, "Alpha" },
{"51af33a33bd9bde6ca6e9c612346b9c138584de59a92bc14a680729066fd849fd83fe668f79e2a06ffe117f39993d10a", CPU_TYPE_ALL_GEN, "mac.i386.exe", 416, ""},
{"117e60cf4445cec0a777d2636091a13c50be5c6ed28afaa75ab09ab4576942f1a8584b36d3abac9db7595dfb0d90207e", CPU_TYPE_ALL_SSX, "mac.sse2.exe", 416, ""},
{"2651dcd3c85b76bf1bbe5520e0e76b9d8db7459a1eb7fc1d49dc32c22dcf99957bcba8961b70c194ea3d4346d8c4118f", CPU_TYPE_X86_ALL, "mediainfo.i386.exe", 782, ""},