diff --git a/devel/dulwich/Makefile b/devel/dulwich/Makefile
index bb247fde0f04..8688936a1346 100644
--- a/devel/dulwich/Makefile
+++ b/devel/dulwich/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	dulwich
-PORTVERSION=	0.15.0
+PORTVERSION=	0.18.6
 CATEGORIES=	devel python
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
@@ -14,7 +14,7 @@ LICENSE=	APACHE20 GPLv2+
 LICENSE_COMB=	dual
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-PORTDOCS=	AUTHORS CONTRIBUTING NEWS README.md TODO conclusion.txt \
+PORTDOCS=	AUTHORS NEWS README.md TODO conclusion.txt \
 		file-format.txt index.txt introduction.txt object-store.txt \
 		performance.txt porcelain.txt protocol.txt remote.txt repo.txt tag.txt
 PORTEXAMPLES=	clone.py config.py diff.py latest_change.py
diff --git a/devel/dulwich/distinfo b/devel/dulwich/distinfo
index b83f4f33d208..de02ca4fb5c2 100644
--- a/devel/dulwich/distinfo
+++ b/devel/dulwich/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1481271050
-SHA256 (dulwich-0.15.0.tar.gz) = 6f0a09d93f01caf1ba054b3f751d5cc1f0e6afc5c97fd23d67d7acf92f0d0b16
-SIZE (dulwich-0.15.0.tar.gz) = 297106
+TIMESTAMP = 1516829918
+SHA256 (dulwich-0.18.6.tar.gz) = 38a04406bc68315794c3bab37c7d4ed137fb8a839482d8894e72b0d9b3eb41a9
+SIZE (dulwich-0.18.6.tar.gz) = 331325
diff --git a/devel/dulwich/files/patch-dulwich.egg-info_SOURCES.txt b/devel/dulwich/files/patch-dulwich.egg-info_SOURCES.txt
index 9e3e7970daed..d45e7b786a5f 100644
--- a/devel/dulwich/files/patch-dulwich.egg-info_SOURCES.txt
+++ b/devel/dulwich/files/patch-dulwich.egg-info_SOURCES.txt
@@ -1,7 +1,7 @@
---- dulwich.egg-info/SOURCES.txt.orig	2016-07-05 22:58:54 UTC
+--- dulwich.egg-info/SOURCES.txt.orig	2018-01-24 22:39:28 UTC
 +++ dulwich.egg-info/SOURCES.txt
-@@ -73,123 +73,6 @@ dulwich/contrib/paramiko_vendor.py
- dulwich/contrib/swift.py
+@@ -76,125 +76,7 @@ dulwich/contrib/swift.py
+ dulwich/contrib/test_release_robot.py
  dulwich/contrib/test_swift.py
  dulwich/contrib/test_swift_smoke.py
 -dulwich/tests/__init__.py
@@ -15,6 +15,7 @@
 -dulwich/tests/test_grafts.py
 -dulwich/tests/test_greenthreads.py
 -dulwich/tests/test_hooks.py
+-dulwich/tests/test_ignore.py
 -dulwich/tests/test_index.py
 -dulwich/tests/test_lru_cache.py
 -dulwich/tests/test_missing_obj_finder.py
@@ -124,3 +125,6 @@
  examples/clone.py
  examples/config.py
  examples/diff.py
+-examples/latest_change.py
+\ No newline at end of file
++examples/latest_change.py
diff --git a/devel/dulwich/files/patch-setup.py b/devel/dulwich/files/patch-setup.py
index 77cdbb22c6ae..4607a71e6665 100644
--- a/devel/dulwich/files/patch-setup.py
+++ b/devel/dulwich/files/patch-setup.py
@@ -1,10 +1,11 @@
---- setup.py.orig	2016-07-05 22:58:08 UTC
-+++ setup.py
-@@ -83,7 +83,7 @@ setup(name='dulwich',
-       The project is named after the part of London that Mr. and Mrs. Git live in
-       in the particular Monty Python sketch.
+--- setup.py.orig	2018-01-24 16:10:15.448366000 -0600
++++ setup.py	2018-01-24 16:10:49.157689000 -0600
+@@ -91,8 +91,7 @@
+       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'],
+-      packages=['dulwich', 'dulwich.tests', 'dulwich.tests.compat',
+-                'dulwich.contrib'],
 +      packages=['dulwich', 'dulwich.contrib'],
        package_data={'': ['../docs/tutorial/*.txt']},
        scripts=['bin/dulwich', 'bin/dul-receive-pack', 'bin/dul-upload-pack'],