diff --git a/taglib/CMakeLists.txt b/taglib/CMakeLists.txt
index c4976f97..6e0970e0 100644
--- a/taglib/CMakeLists.txt
+++ b/taglib/CMakeLists.txt
@@ -14,6 +14,8 @@ INCLUDE_DIRECTORIES(
     ${CMAKE_CURRENT_SOURCE_DIR}/ape
     ${CMAKE_CURRENT_SOURCE_DIR}/wavpack
     ${CMAKE_CURRENT_SOURCE_DIR}/trueaudio
+    ${CMAKE_CURRENT_SOURCE_DIR}/riff
+    ${CMAKE_CURRENT_SOURCE_DIR}/riff/aiff
     ${CMAKE_CURRENT_BINARY_DIR}/taglib
     ${CMAKE_CURRENT_BINARY_DIR}/..
 )
@@ -29,8 +31,7 @@ ADD_SUBDIRECTORY( ape )
 ADD_SUBDIRECTORY( mpc )
 ADD_SUBDIRECTORY( wavpack )
 ADD_SUBDIRECTORY( trueaudio )
-
-
+ADD_SUBDIRECTORY( riff )
 
 ########### next target ###############
 
@@ -118,6 +119,14 @@ trueaudio/trueaudiofile.cpp
 trueaudio/trueaudioproperties.cpp
 )
 
+SET(riff_SRCS
+riff/rifffile.cpp
+)
+
+SET(aiff_SRCS
+riff/aiff/aifffile.cpp
+)
+
 SET(toolkit_SRCS
 toolkit/tstring.cpp
 toolkit/tstringlist.cpp
@@ -130,7 +139,7 @@ toolkit/unicode.cpp
 
 SET(tag_LIB_SRCS ${mpeg_SRCS} ${id3v1_SRCS} ${id3v2_SRCS} ${frames_SRCS} ${ogg_SRCS}
 		 ${vorbis_SRCS} ${oggflacs_SRCS} ${mpc_SRCS} ${ape_SRCS} ${toolkit_SRCS} ${flacs_SRCS}
-		 ${wavpack_SRCS} ${speex_SRCS} ${trueaudio_SRCS}
+		 ${wavpack_SRCS} ${speex_SRCS} ${trueaudio_SRCS} ${riff_SRCS} ${aiff_SRCS}
 		 tag.cpp
 		 tagunion.cpp
 		 fileref.cpp
diff --git a/taglib/riff/CMakeLists.txt b/taglib/riff/CMakeLists.txt
new file mode 100644
index 00000000..56c35d96
--- /dev/null
+++ b/taglib/riff/CMakeLists.txt
@@ -0,0 +1,3 @@
+ADD_SUBDIRECTORY( aiff )
+
+INSTALL( FILES  rifffile.h DESTINATION ${INCLUDE_INSTALL_DIR}/taglib)
diff --git a/taglib/riff/aiff/CMakeLists.txt b/taglib/riff/aiff/CMakeLists.txt
new file mode 100644
index 00000000..463cbe43
--- /dev/null
+++ b/taglib/riff/aiff/CMakeLists.txt
@@ -0,0 +1 @@
+INSTALL( FILES  aifffile.h DESTINATION ${INCLUDE_INSTALL_DIR}/taglib)
diff --git a/taglib/riff/rifffile.cpp b/taglib/riff/rifffile.cpp
index e7d557a9..34c320ed 100644
--- a/taglib/riff/rifffile.cpp
+++ b/taglib/riff/rifffile.cpp
@@ -73,12 +73,12 @@ RIFF::File::File(FileName file, Endianness endianness) : TagLib::File(file)
     read();
 }
 
-uint RIFF::File::chunkCount() const
+TagLib::uint RIFF::File::chunkCount() const
 {
   return d->chunkNames.size();
 }
 
-uint RIFF::File::chunkOffset(uint i) const
+TagLib::uint RIFF::File::chunkOffset(uint i) const
 {
   return d->chunkOffsets[i];
 }