diff --git a/autotests/taglibwritertest.cpp b/autotests/taglibwritertest.cpp
--- a/autotests/taglibwritertest.cpp
+++ b/autotests/taglibwritertest.cpp
@@ -95,6 +95,30 @@
     QTest::addColumn<QString>("stringSuffix");
 
 
+    QTest::addRow("aiff")
+        << QStringLiteral("aif")
+        << QStringLiteral("audio/x-aiff")
+        << QString()
+        ;
+
+    QTest::addRow("aiff_unicode")
+        << QStringLiteral("aif")
+        << QStringLiteral("audio/x-aiff")
+        << unicodeTestStringSuffix
+        ;
+
+    QTest::addRow("ape")
+        << QStringLiteral("ape")
+        << QStringLiteral("audio/x-ape")
+        << QString()
+        ;
+
+    QTest::addRow("ape_unicode")
+        << QStringLiteral("ape")
+        << QStringLiteral("audio/x-ape")
+        << unicodeTestStringSuffix
+        ;
+
     QTest::addRow("flac")
         << QStringLiteral("flac")
         << QStringLiteral("audio/flac")
@@ -166,6 +190,54 @@
         << QStringLiteral("audio/opus")
         << unicodeTestStringSuffix
         ;
+
+    QTest::addRow("speex")
+        << QStringLiteral("spx")
+        << QStringLiteral("audio/speex")
+        << QString()
+        ;
+
+    QTest::addRow("speex_unicode")
+        << QStringLiteral("spx")
+        << QStringLiteral("audio/speex")
+        << unicodeTestStringSuffix
+        ;
+
+    QTest::addRow("wav")
+        << QStringLiteral("wav")
+        << QStringLiteral("audio/wav")
+        << QString()
+        ;
+
+    QTest::addRow("wav_unicode")
+        << QStringLiteral("wav")
+        << QStringLiteral("audio/wav")
+        << unicodeTestStringSuffix
+        ;
+
+    QTest::addRow("wavpack")
+        << QStringLiteral("wv")
+        << QStringLiteral("audio/x-wavpack")
+        << QString()
+        ;
+
+    QTest::addRow("wavpack_unicode")
+        << QStringLiteral("wv")
+        << QStringLiteral("audio/x-wavpack")
+        << unicodeTestStringSuffix
+        ;
+
+    QTest::addRow("wma")
+        << QStringLiteral("wma")
+        << QStringLiteral("audio/x-ms-wma")
+        << QString()
+        ;
+
+    QTest::addRow("wma_unicode")
+        << QStringLiteral("wma")
+        << QStringLiteral("audio/x-ms-wma")
+        << unicodeTestStringSuffix
+        ;
 }
 
 QTEST_GUILESS_MAIN(TagLibWriterTest)
diff --git a/src/writers/taglibwriter.cpp b/src/writers/taglibwriter.cpp
--- a/src/writers/taglibwriter.cpp
+++ b/src/writers/taglibwriter.cpp
@@ -39,10 +39,18 @@
     QStringLiteral("audio/mpeg3"),
     QStringLiteral("audio/ogg"),
     QStringLiteral("audio/opus"),
+    QStringLiteral("audio/speex"),
+    QStringLiteral("audio/wav"),
+    QStringLiteral("audio/x-aiff"),
+    QStringLiteral("audio/x-ape"),
     QStringLiteral("audio/x-mpeg"),
+    QStringLiteral("audio/x-ms-wma"),
     QStringLiteral("audio/x-musepack"),
     QStringLiteral("audio/x-opus+ogg"),
+    QStringLiteral("audio/x-speex"),
     QStringLiteral("audio/x-vorbis+ogg"),
+    QStringLiteral("audio/x-wav"),
+    QStringLiteral("audio/x-wavpack"),
 };
 
 QStringList TagLibWriter::writeMimetypes() const