diff --git a/dulwich/__init__.py b/dulwich/__init__.py
index 93c4aeb3..8da5ead7 100644
--- a/dulwich/__init__.py
+++ b/dulwich/__init__.py
@@ -1,25 +1,25 @@
 # __init__.py -- The git module of dulwich
 # Copyright (C) 2007 James Westby <jw+debian@jameswestby.net>
 # Copyright (C) 2008 Jelmer Vernooij <jelmer@samba.org>
 #
 # Dulwich is dual-licensed under the Apache License, Version 2.0 and the GNU
 # General Public License as public by the Free Software Foundation; version 2.0
 # or (at your option) any later version. You can redistribute it and/or
 # modify it under the terms of either of these two licenses.
 #
 # Unless required by applicable law or agreed to in writing, software
 # distributed under the License is distributed on an "AS IS" BASIS,
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #
 # You should have received a copy of the licenses; if not, see
 # <http://www.gnu.org/licenses/> for a copy of the GNU General Public License
 # and <http://www.apache.org/licenses/LICENSE-2.0> for a copy of the Apache
 # License, Version 2.0.
 #
 
 
 """Python implementation of the Git file formats and protocols."""
 
-__version__ = (0, 18, 3)
+__version__ = (0, 18, 4)
diff --git a/setup.py b/setup.py
index d69a3d35..0e027b76 100755
--- a/setup.py
+++ b/setup.py
@@ -1,116 +1,116 @@
 #!/usr/bin/python
 # encoding: utf-8
 # Setup file for dulwich
 # Copyright (C) 2008-2016 Jelmer Vernooij <jelmer@jelmer.uk>
 
 try:
     from setuptools import setup, Extension
 except ImportError:
     from distutils.core import setup, Extension
 from distutils.core import Distribution
 import os
 import sys
 
-dulwich_version_string = '0.18.3'
+dulwich_version_string = '0.18.4'
 
 include_dirs = []
 # Windows MSVC support
 if sys.platform == 'win32' and sys.version_info[:2] < (3, 6):
     # Include dulwich/ for fallback stdint.h
     include_dirs.append('dulwich')
 
 
 class DulwichDistribution(Distribution):
 
     def is_pure(self):
         if self.pure:
             return True
 
     def has_ext_modules(self):
         return not self.pure
 
     global_options = Distribution.global_options + [
         ('pure', None, "use pure Python code instead of C "
                        "extensions (slower on CPython)")]
 
     pure = False
 
 
 if sys.platform == 'darwin' and os.path.exists('/usr/bin/xcodebuild'):
     # XCode 4.0 dropped support for ppc architecture, which is hardcoded in
     # distutils.sysconfig
     import subprocess
     p = subprocess.Popen(
         ['/usr/bin/xcodebuild', '-version'], stdout=subprocess.PIPE,
         stderr=subprocess.PIPE, env={})
     out, err = p.communicate()
     for l in out.splitlines():
         l = l.decode("utf8")
         # Also parse only first digit, because 3.2.1 can't be parsed nicely
         if l.startswith('Xcode') and int(l.split()[1].split('.')[0]) >= 4:
             os.environ['ARCHFLAGS'] = ''
 
 tests_require = ['fastimport']
 
 
 if '__pypy__' not in sys.modules and not sys.platform == 'win32':
     tests_require.extend([
         'gevent', 'geventhttpclient', 'mock', 'setuptools>=17.1'])
 
 ext_modules = [
     Extension('dulwich._objects', ['dulwich/_objects.c'],
               include_dirs=include_dirs),
     Extension('dulwich._pack', ['dulwich/_pack.c'],
               include_dirs=include_dirs),
     Extension('dulwich._diff_tree', ['dulwich/_diff_tree.c'],
               include_dirs=include_dirs),
 ]
 
 
 if sys.platform == 'win32':
     # Win32 setup breaks with non-ascii characters.
     author = "Jelmer Vernooij"
 else:
     author = "Jelmer Vernooij"
 
 setup(name='dulwich',
       description='Python Git Library',
       keywords='git',
       version=dulwich_version_string,
       url='https://www.dulwich.io/',
       license='Apachev2 or later or GPLv2',
       author_email='jelmer@jelmer.uk',
       long_description="""
       Python implementation of the Git file formats and protocols,
       without the need to have git installed.
 
       All functionality is available in pure Python. Optional
       C extensions can be built for improved performance.
 
       The project is named after the part of London that Mr. and Mrs. Git live
       in in the particular Monty Python sketch.
       """,
       packages=['dulwich', 'dulwich.tests', 'dulwich.tests.compat',
                 'dulwich.contrib'],
       package_data={'': ['../docs/tutorial/*.txt']},
       scripts=['bin/dulwich', 'bin/dul-receive-pack', 'bin/dul-upload-pack'],
       classifiers=[
           'Development Status :: 4 - Beta',
           'License :: OSI Approved :: Apache Software License',
           'Programming Language :: Python :: 2.7',
           'Programming Language :: Python :: 3.3',
           'Programming Language :: Python :: 3.4',
           'Programming Language :: Python :: 3.5',
           'Programming Language :: Python :: 3.6',
           'Programming Language :: Python :: Implementation :: CPython',
           'Programming Language :: Python :: Implementation :: PyPy',
           'Operating System :: POSIX',
           'Operating System :: Microsoft :: Windows',
           'Topic :: Software Development :: Version Control',
       ],
       ext_modules=ext_modules,
       test_suite='dulwich.tests.test_suite',
       tests_require=tests_require,
       distclass=DulwichDistribution,
       include_package_data=True,
       )