diff --git a/README.md b/README.md
index 5f087995..1c9b1f38 100644
--- a/README.md
+++ b/README.md
@@ -10,7 +10,7 @@ TagLib is a library for reading and editing the metadata of several
 popular audio formats. Currently it supports both ID3v1 and [ID3v2][]
 for MP3 files, [Ogg Vorbis][] comments and ID3 tags 
 in [FLAC][], MPC, Speex, WavPack, TrueAudio, WAV, AIFF, MP4, APE,
-DSF, DFF, and ASF files.
+and ASF files.
 
 TagLib is distributed under the [GNU Lesser General Public License][]
 (LGPL) and [Mozilla Public License][] (MPL). Essentially that means that
diff --git a/taglib/CMakeLists.txt b/taglib/CMakeLists.txt
index 52c6c32a..563583ef 100644
--- a/taglib/CMakeLists.txt
+++ b/taglib/CMakeLists.txt
@@ -24,8 +24,6 @@ include_directories(
   ${CMAKE_CURRENT_SOURCE_DIR}/s3m
   ${CMAKE_CURRENT_SOURCE_DIR}/it
   ${CMAKE_CURRENT_SOURCE_DIR}/xm
-  ${CMAKE_CURRENT_SOURCE_DIR}/dsf
-  ${CMAKE_CURRENT_SOURCE_DIR}/dsdiff
   ${taglib_SOURCE_DIR}/3rdparty
 )
 
diff --git a/tests/data/empty10ms.dff b/tests/data/empty10ms.dff
deleted file mode 100644
index 9dc0b9ec..00000000
Binary files a/tests/data/empty10ms.dff and /dev/null differ
diff --git a/tests/data/empty10ms.dsf b/tests/data/empty10ms.dsf
deleted file mode 100644
index 31a4d7c1..00000000
Binary files a/tests/data/empty10ms.dsf and /dev/null differ