diff --git a/Tests/run.py b/Tests/run.py
index f24a0c6b0..14c9f6d5c 100644
--- a/Tests/run.py
+++ b/Tests/run.py
@@ -32,12 +32,14 @@ if "--log" in sys.argv:
 files = glob.glob(os.path.join(root, "test_*.py"))
 files.sort()
 
-files.remove('Tests/test_file_tiff.py')
-
 success = failure = 0
 include = [x for x in sys.argv[1:] if x[:2] != "--"]
 skipped = []
 
+# XXX Skip test, is there a better way?
+files.remove('Tests/test_file_tiff.py')
+skipped.append('test_file_tiff')
+
 python_options = " ".join(python_options)
 tester_options = " ".join(tester_options)
 
diff --git a/docs/HISTORY.txt b/docs/HISTORY.txt
index 5d6d82db3..45c755a2f 100644
--- a/docs/HISTORY.txt
+++ b/docs/HISTORY.txt
@@ -7,9 +7,12 @@ 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
+- Add WebP support.
   [lqs]
 
+- Add experimental Tiff G3/G4 support.
+  [wiredfool]
+
 - Many other bug fixes and enhancements by many other people (see docs/CONTRIBUTORS.txt).
 
 1.7.8 (2012-11-01)