diff --git a/res/tools/opusdec.exe b/res/tools/opusdec.exe
index 43ea4894..936355a2 100644
Binary files a/res/tools/opusdec.exe and b/res/tools/opusdec.exe differ
diff --git a/res/tools/opusenc.exe b/res/tools/opusenc.exe
index e0c6af6c..a9e6218b 100644
Binary files a/res/tools/opusenc.exe and b/res/tools/opusenc.exe differ
diff --git a/src/Config.h b/src/Config.h
index bbfaaed5..4096d009 100644
--- a/src/Config.h
+++ b/src/Config.h
@@ -29,8 +29,8 @@
 #define VER_LAMEXP_MINOR_HI					0
 #define VER_LAMEXP_MINOR_LO					7
 #define VER_LAMEXP_TYPE						Beta
-#define VER_LAMEXP_PATCH					1
-#define VER_LAMEXP_BUILD					1230
+#define VER_LAMEXP_PATCH					2
+#define VER_LAMEXP_BUILD					1232
 
 ///////////////////////////////////////////////////////////////////////////////
 // Tool versions (minimum expected versions!)
diff --git a/src/Encoder_Opus.cpp b/src/Encoder_Opus.cpp
index caa77f83..3e63ae12 100644
--- a/src/Encoder_Opus.cpp
+++ b/src/Encoder_Opus.cpp
@@ -107,11 +107,11 @@ bool OpusEncoder::encode(const QString &sourceFile, const AudioFileModel &metaIn
 
 	if(!metaInfo.fileName().isEmpty()) args << "--title" << cleanTag(metaInfo.fileName());
 	if(!metaInfo.fileArtist().isEmpty()) args << "--artist" << cleanTag(metaInfo.fileArtist());
-	if(!metaInfo.fileAlbum().isEmpty()) args << "--comment" << QString("album=%1").arg(cleanTag(metaInfo.fileAlbum()));
-	if(!metaInfo.fileGenre().isEmpty()) args << "--comment" << QString("genre=%1").arg(cleanTag(metaInfo.fileGenre()));
+	if(!metaInfo.fileAlbum().isEmpty()) args << "--album" << cleanTag(metaInfo.fileAlbum());
+	if(!metaInfo.fileGenre().isEmpty()) args << "--genre" << cleanTag(metaInfo.fileGenre());
+	if(metaInfo.fileYear()) args << "--date" << QString::number(metaInfo.fileYear());
+	if(metaInfo.filePosition()) args << "--comment" << QString("tracknumber=%1").arg(QString::number(metaInfo.filePosition()));
 	if(!metaInfo.fileComment().isEmpty()) args << "--comment" << QString("comment=%1").arg(cleanTag(metaInfo.fileComment()));
-	if(metaInfo.fileYear()) args << "--comment" << QString("date=%1").arg(QString::number(metaInfo.fileYear()));
-	if(metaInfo.filePosition()) args << "--comment" << QString("track=%1").arg(QString::number(metaInfo.filePosition()));
 	
 	if(!m_configCustomParams.isEmpty()) args << m_configCustomParams.split(" ", QString::SkipEmptyParts);
 
diff --git a/src/Tools.h b/src/Tools.h
index b6d8c695..e85ab347 100644
--- a/src/Tools.h
+++ b/src/Tools.h
@@ -72,8 +72,8 @@ g_lamexp_tools[] =
 	{"8b68461f38410421be30cc895e94e63184daa6f2cb20eb110b66b376b48141838a09bc920efeb1c49de79dd0770ce41b", CPU_TYPE_X86_GEN, "oggenc2.i386.exe", 287603},
 	{"20648f83cc637cada481143d48c437ced8423e9a0aae01dbce860cd97fb1ce4000e314f3a5395d1eafd8e154a8e74d08", CPU_TYPE_X86_SSE, "oggenc2.sse2.exe", 287603},
 	{"e1da48055a57bae41d6a1a0dc08b86831c121e85c07aa60aae4196997b166a08cfb7265d9f0f289f445ad73bce28d81f", CPU_TYPE_X64_ALL, "oggenc2.x64.exe",  287603},
-	{"9d6c5f841a8ad571873e33608484584ae4d51441a2ae4c3a961c5e9f49eadeaed5c4c56d47e0b530846f0366e4b9bb37", CPU_TYPE_ALL_ALL, "opusdec.exe", 20130118},
-	{"d1fc38b83e078571a211af7f9c2608ad059d22b2b7c0f089f2a1000fd7000da3bd09d3f86f52859b8746572b00ae3cf1", CPU_TYPE_ALL_ALL, "opusenc.exe", 20130118},
+	{"d4c081ca0807b9b0e8f01c7a68f2cf2985308f614a045193ced0b51ead0b06628642f607679b7e9e48c9b7b59a8fc651", CPU_TYPE_ALL_ALL, "opusdec.exe", 20130124},
+	{"915eb675678e24fd7351032e60b5e49f3457b37e748d185f37a212625f4c421fb3369adf4ef504dd6aaa9f1bed702ba7", CPU_TYPE_ALL_ALL, "opusenc.exe", 20130124},
 	{"bdfa8dec142b6327a33af6bb314d7beb924588d1b73f2ef3f46b31fa6046fe2f4e64ca78b025b7eb9290a78320e2aa57", CPU_TYPE_ALL_ALL, "refalac.exe", 56},
 	{"d041b60de6c5c6e77cbad84440db57bbeb021af59dd0f7bebd3ede047d9e2ddc2a0c14179472687ba91063743d23e337", CPU_TYPE_ALL_ALL, "shorten.exe", 361},
 	{"81633b4808ff13e25249aac038ed97570aaeea2bbffacf0f3905514064d1b82d141a6b04f63f1a913e4d09b2d892aea0", CPU_TYPE_ALL_ALL, "sox.exe", 1440},