diff --git a/decode.c b/decode.c
index cb037072b..41557d687 100644
--- a/decode.c
+++ b/decode.c
@@ -394,7 +394,7 @@ PyImaging_TiffLzwDecoderNew(PyObject* self, PyObject* args)
 
 #ifdef HAVE_LIBTIFF
 
-#include "Tiff.h"
+#include "TiffDecode.h"
 
 #include <string.h>
 #ifdef __WIN32__
diff --git a/docs/CONTRIBUTORS.rst b/docs/CONTRIBUTORS.rst
index f016aed97..6f6cbe440 100644
--- a/docs/CONTRIBUTORS.rst
+++ b/docs/CONTRIBUTORS.rst
@@ -31,3 +31,5 @@ Contributors (Pillow)
 - Tyler Garner <garnertb __at__ gmail.com>, developer
 - etienne <etienne.desautels __at__ gmail.com>, developer
 - tdesvenain <thomas.desvenain __at__ gmail.com>, developer
+- Liu Qishuai <lqs __at__ lqs.me>, developer
+- wiredfool <eric-github __at__ soroos.net>, developer
diff --git a/docs/HISTORY.txt b/docs/HISTORY.txt
index dcfa56571..5d6d82db3 100644
--- a/docs/HISTORY.txt
+++ b/docs/HISTORY.txt
@@ -7,6 +7,9 @@ Changelog (Pillow)
 - Add Python 3 support. (Pillow >= 2.0.0 supports Python 2.6, 2.7, 3.2, 3.3. Pillow < 2.0.0 supports Python 2.4, 2.5, 2.6, 2.7.)
   [fluggo]
 
+- Add WebP support
+  [lqs]
+
 - Many other bug fixes and enhancements by many other people (see docs/CONTRIBUTORS.txt).
 
 1.7.8 (2012-11-01)
diff --git a/encode.c b/encode.c
index b3d6faeae..90a8095fc 100644
--- a/encode.c
+++ b/encode.c
@@ -657,7 +657,7 @@ PyImaging_JpegEncoderNew(PyObject* self, PyObject* args)
 
 #ifdef HAVE_LIBTIFF
 
-#include "Tiff.h"
+#include "TiffDecode.h"
 
 #include <string.h>
 #ifdef __WIN32__
diff --git a/libImaging/TiffDecode.c b/libImaging/TiffDecode.c
index f380b6c39..0927f29e9 100644
--- a/libImaging/TiffDecode.c
+++ b/libImaging/TiffDecode.c
@@ -18,7 +18,7 @@
 #define uint uint32
 #endif
 
-#include "Tiff.h"
+#include "TiffDecode.h"
 
 void dump_state(const TIFFSTATE *state){
 	TRACE(("State: Location %u size %d eof %d data: %p \n", (uint)state->loc, 
diff --git a/libImaging/Tiff.h b/libImaging/TiffDecode.h
similarity index 100%
rename from libImaging/Tiff.h
rename to libImaging/TiffDecode.h