diff --git a/taglib/riff/wav/wavfile.cpp b/taglib/riff/wav/wavfile.cpp
index dd7da2c8..489adc3b 100644
--- a/taglib/riff/wav/wavfile.cpp
+++ b/taglib/riff/wav/wavfile.cpp
@@ -86,9 +86,9 @@ RIFF::WAV::File::~File()
   delete d;
 }
 
-Tag *RIFF::WAV::File::tag() const
+ID3v2::Tag *RIFF::WAV::File::tag() const
 {
-  return &d->tag;
+  return ID3v2Tag();
 }
 
 ID3v2::Tag *RIFF::WAV::File::ID3v2Tag() const
diff --git a/taglib/riff/wav/wavfile.h b/taglib/riff/wav/wavfile.h
index c0fa122e..287db25b 100644
--- a/taglib/riff/wav/wavfile.h
+++ b/taglib/riff/wav/wavfile.h
@@ -94,12 +94,21 @@ namespace TagLib {
         virtual ~File();
 
         /*!
-         * Returns the Tag for this file.
+         * Returns the ID3v2 Tag for this file.
+         * 
+         * \note This method does not return all the tags for this file for 
+         * backward compatibility.  Will be fixed in TagLib 2.0.
          */
-        virtual Tag *tag() const;
+        ID3v2::Tag *RIFF::WAV::File::tag() const;
 
+        /*!
+         * Returns the ID3v2 Tag for this file.
+         */
         ID3v2::Tag *ID3v2Tag() const;
 
+        /*!
+         * Returns the RIFF INFO Tag for this file.
+         */
         Info::Tag *InfoTag() const;
 
         /*!