diff --git a/ChangeLog b/ChangeLog
index 8a07bdd03..493cc0e9f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2004-09-28  Moritz Bunkus  <moritz@bunkus.org>
+
+	* mkvextract: bug fix: The WAV writer was not endian safe.
+
 2004-09-27  Moritz Bunkus  <moritz@bunkus.org>
 
 	* mkvmerge: bug fix: The charset was not set correctly on Solaris.
diff --git a/src/extract/tracks.cpp b/src/extract/tracks.cpp
index a03a5dc20..60b20f6d3 100644
--- a/src/extract/tracks.cpp
+++ b/src/extract/tracks.cpp
@@ -970,8 +970,8 @@ close_files() {
         case TYPEWAV:
           // Fix the header with the real number of bytes written.
           tracks[i].out->setFilePointer(0);
-          tracks[i].wh.riff.len = tracks[i].bytes_written + 36;
-          tracks[i].wh.data.len = tracks[i].bytes_written;
+          put_uint32(&tracks[i].wh.riff.len, tracks[i].bytes_written + 36);
+          put_uint32(&tracks[i].wh.data.len, tracks[i].bytes_written);
           tracks[i].out->write(&tracks[i].wh, sizeof(wave_header));
           delete tracks[i].out;