diff --git a/src/Config.h b/src/Config.h
index f1bcf712..ad7e3d98 100644
--- a/src/Config.h
+++ b/src/Config.h
@@ -30,7 +30,7 @@
 #define VER_LAMEXP_MINOR_LO					4
 #define VER_LAMEXP_TYPE						Beta
 #define VER_LAMEXP_PATCH					5
-#define VER_LAMEXP_BUILD					904
+#define VER_LAMEXP_BUILD					905
 
 ///////////////////////////////////////////////////////////////////////////////
 // Tool versions (minimum expected versions!)
diff --git a/src/Encoder_FLAC.cpp b/src/Encoder_FLAC.cpp
index c177aabf..0add2361 100644
--- a/src/Encoder_FLAC.cpp
+++ b/src/Encoder_FLAC.cpp
@@ -47,6 +47,7 @@ bool FLACEncoder::encode(const QString &sourceFile, const AudioFileModel &metaIn
 	QStringList args;
 
 	args << QString("-%1").arg(QString::number(qMax(0, qMin(8, m_configBitrate))));
+	args << "--channel-map=none";
 
 	if(!metaInfo.fileName().isEmpty()) args << "-T" << QString("title=%1").arg(metaInfo.fileName());
 	if(!metaInfo.fileArtist().isEmpty()) args << "-T" << QString("artist=%1").arg(metaInfo.fileArtist());
@@ -152,7 +153,7 @@ bool FLACEncoder::isFormatSupported(const QString &containerType, const QString
 
 const unsigned int *FLACEncoder::supportedChannelCount(void)
 {
-	static const unsigned int supportedChannels[] = {2, 5, 6, NULL};
+	static const unsigned int supportedChannels[] = {2, 4, 5, 6, 7, 8, NULL};
 	return supportedChannels;
 }