diff --git a/.travis.yml b/.travis.yml
index 37a40eb2..f8460d1e 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -9,9 +9,9 @@ os:
   - osx
 
 install:
-  - wget 'https://googletest.googlecode.com/files/gtest-1.6.0.zip'
-  - unzip gtest-1.6.0.zip
-  - ln -s gtest-1.6.0 gtest
+  - wget 'https://googletest.googlecode.com/files/gtest-1.7.0.zip'
+  - unzip gtest-1.7.0.zip
+  - ln -s gtest-1.7.0 gtest
   - sudo pip install BeautifulSoup
   - sudo pip install html5lib==0.95
   - ln -s `python -c 'import html5lib, os; print os.path.dirname(html5lib.__file__)'`/tests/testdata .
diff --git a/CHANGES.md b/CHANGES.md
index c28aa661..b40cbe63 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -1,3 +1,17 @@
+Gumbo 0.9.3 (2015-02-17)
+
+* Bugfix for Æ entities (rgrove)
+* Fix CDATA handling; CDATA sections now generate a GUMBO_NODE_CDATA node rather
+than plain text.
+* Fix get_title example to handle whitespace nodes (gsnedders)
+* Visual Studio compilation fixes (fishioon)
+* Take the namespace into account when determining whether a node matches a
+certain tag (aroben)
+* Replace the varargs tag functions with a tagset bytevector, for a 20-30%
+speedup in overall parse time (kevinhendricks, vmg)
+* Add MacOS X support to Travis CI, and fix the deployment/DLL issues this
+uncovered (nostrademons, kevinhendricks, vmg)
+
 Gumbo 0.9.2 (2014-09-21)
 
 * Performance improvements: Ragel-based char ref decoder and DFA-based UTF8
@@ -9,7 +23,7 @@ Gumbo 0.9.2 (2014-09-21)
 * Fix duplicate attributes when parsing <isindex> tags.
 * Don't leave semicolons behind when consuming entity references (rgrove)
 * Internally rename some functions in preparation for an amalgamation file
-* (jdeng)
+(jdeng)
 * Add proper cflags for gyp builds (skabbes)
 
 Gumbo 0.9.1 (2014-08-07)
diff --git a/THANKS b/THANKS
index e8731f25..8461428b 100644
--- a/THANKS
+++ b/THANKS
@@ -3,6 +3,7 @@ Gumbo HTML parser THANKS file
 Gumbo was originally written by Jonathan Tang, but many people helped out through suggestions, question-answering, code reviews, bugfixes, and organizational support.  Here is a list of these people.  Help me keep it complete and exempt of errors.
 
 Adam Barth
+Adam Roben
 Ben Noordhuis
 Bowen Han
 Constantinos Michael
@@ -11,6 +12,7 @@ Geoffrey Sneddon
 Ian Hickson
 Jack Deng
 Jonathan Shneier
+Kevin Hendricks
 Mason Tang
 Maxim Zakharov
 Neal Norwitz
@@ -20,3 +22,4 @@ Stefan Haustein
 Steffen Meschkat
 Steven Kabbes
 Thiago Farina
+Vicent Marti
diff --git a/setup.py b/setup.py
index 4f06749e..1c20cef5 100644
--- a/setup.py
+++ b/setup.py
@@ -1,14 +1,22 @@
 #!/usr/bin/env python
+import sys
 from setuptools import setup
 from setuptools.command.sdist import sdist
 
+_name_of_lib = 'libgumbo.so'
+if sys.platform.startswith('darwin'):
+    _name_of_lib = 'libgumbo.dylib'
+elif sys.platform.startswith('win'):
+    _name_of_lib = 'gumbo.dll'
+
 class CustomSdistCommand(sdist):
     """Customized Sdist command, to copy libgumbo.so into the Python directory
     so that it can be installed with `pip install`."""
     def run(self):
         try:
             import shutil
-            shutil.copyfile('.libs/libgumbo.so', 'python/gumbo/libgumbo.so')
+            shutil.copyfile('.libs/' + _name_of_lib,
+                'python/gumbo/' + _name_of_lib)
             sdist.run(self)
         except IOError as e:
             print(e)
@@ -172,6 +180,6 @@ def run(self):
       classifiers=CLASSIFIERS,
       packages=['gumbo'],
       package_dir={'': 'python'},
-      package_data={'gumbo': ['libgumbo.so']},
+      package_data={'gumbo': [_name_of_lib]},
       cmdclass={ 'sdist': CustomSdistCommand },
       zip_safe=False)