diff --git a/taglib/CMakeLists.txt b/taglib/CMakeLists.txt
index 61bcb49e..ebb9165d 100644
--- a/taglib/CMakeLists.txt
+++ b/taglib/CMakeLists.txt
@@ -103,6 +103,7 @@ set(tag_HDRS
   riff/aiff/aiffproperties.h
   riff/wav/wavfile.h
   riff/wav/wavproperties.h
+  riff/wav/infotag.h
   asf/asffile.h
   asf/asfproperties.h
   asf/asftag.h
@@ -244,6 +245,7 @@ set(aiff_SRCS
 set(wav_SRCS
   riff/wav/wavfile.cpp
   riff/wav/wavproperties.cpp
+  riff/wav/infotag.cpp
 )
 
 set(mod_SRCS
diff --git a/taglib/riff/wav/wavfile.h b/taglib/riff/wav/wavfile.h
index 287db25b..18ce2336 100644
--- a/taglib/riff/wav/wavfile.h
+++ b/taglib/riff/wav/wavfile.h
@@ -99,7 +99,7 @@ namespace TagLib {
          * \note This method does not return all the tags for this file for 
          * backward compatibility.  Will be fixed in TagLib 2.0.
          */
-        ID3v2::Tag *RIFF::WAV::File::tag() const;
+        ID3v2::Tag *tag() const;
 
         /*!
          * Returns the ID3v2 Tag for this file.