diff --git a/www/urlwatch/Makefile b/www/urlwatch/Makefile
index b90282753b4..802614fe8a2 100644
--- a/www/urlwatch/Makefile
+++ b/www/urlwatch/Makefile
@@ -1,8 +1,8 @@
-# $OpenBSD: Makefile,v 1.8 2016/11/01 15:27:24 sthen Exp $
+# $OpenBSD: Makefile,v 1.9 2016/12/14 10:17:21 sthen Exp $
 
 COMMENT=	monitor webpages for updates
 
-MODPY_EGG_VERSION=	2.5
+MODPY_EGG_VERSION=	2.6
 DISTNAME=	urlwatch-${MODPY_EGG_VERSION}
 
 CATEGORIES=	www
diff --git a/www/urlwatch/distinfo b/www/urlwatch/distinfo
index 3f4baa0a970..2991ec360e5 100644
--- a/www/urlwatch/distinfo
+++ b/www/urlwatch/distinfo
@@ -1,2 +1,2 @@
-SHA256 (urlwatch-2.5.tar.gz) = YBCkXbwg1USfIUZVyUl3pl4eK4ujL1jpBF3f2qq/OWI=
-SIZE (urlwatch-2.5.tar.gz) = 25322
+SHA256 (urlwatch-2.6.tar.gz) = V6kKCno/BWu/d8kXYhoSQzjeIOFc41aHO5q7py9X1vQ=
+SIZE (urlwatch-2.6.tar.gz) = 30412
diff --git a/www/urlwatch/patches/patch-lib_urlwatch_config_py b/www/urlwatch/patches/patch-lib_urlwatch_config_py
new file mode 100644
index 00000000000..f2fcd8b7e7c
--- /dev/null
+++ b/www/urlwatch/patches/patch-lib_urlwatch_config_py
@@ -0,0 +1,13 @@
+$OpenBSD: patch-lib_urlwatch_config_py,v 1.1 2016/12/14 10:17:21 sthen Exp $
+--- lib/urlwatch/config.py.orig	Tue Dec  6 14:08:12 2016
++++ lib/urlwatch/config.py	Tue Dec  6 14:08:37 2016
+@@ -61,7 +61,8 @@ class CommandConfig(BaseConfig):
+ 
+         if self.bindir == 'bin':
+             # Installed system-wide
+-            self.examples_dir = os.path.join(prefix, 'share', self.pkgname, 'examples')
++            self.examples_dir = os.path.join(prefix, 'share', 'examples', self.pkgname)
++
+         else:
+             # Assume we are not yet installed
+             self.examples_dir = os.path.join(prefix, bindir, 'share', self.pkgname, 'examples')
diff --git a/www/urlwatch/patches/patch-urlwatch b/www/urlwatch/patches/patch-urlwatch
deleted file mode 100644
index ac1cfb1fcb0..00000000000
--- a/www/urlwatch/patches/patch-urlwatch
+++ /dev/null
@@ -1,12 +0,0 @@
-$OpenBSD: patch-urlwatch,v 1.5 2016/11/01 15:27:24 sthen Exp $
---- urlwatch.orig	Tue Jul 12 20:53:30 2016
-+++ urlwatch	Tue Nov  1 15:25:00 2016
-@@ -61,7 +61,7 @@ hooks_py = os.path.join(urlwatch_dir, 'hooks.py')
- 
- if bindir == 'bin':
-     # Installed system-wide
--    examples_dir = os.path.join(prefix, 'share', pkgname, 'examples')
-+    examples_dir = os.path.join(prefix, 'share', 'examples', pkgname)
- else:
-     # Assume we are not yet installed
-     sys.path.insert(0, os.path.join(prefix, bindir, 'lib'))
diff --git a/www/urlwatch/pkg/PLIST b/www/urlwatch/pkg/PLIST
index 650350d753e..1401f0abe2f 100644
--- a/www/urlwatch/pkg/PLIST
+++ b/www/urlwatch/pkg/PLIST
@@ -1,4 +1,4 @@
-@comment $OpenBSD: PLIST,v 1.3 2016/11/01 14:20:15 rpe Exp $
+@comment $OpenBSD: PLIST,v 1.4 2016/12/14 10:17:21 sthen Exp $
 bin/urlwatch
 lib/python${MODPY_VERSION}/site-packages/urlwatch/
 lib/python${MODPY_VERSION}/site-packages/urlwatch-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/
@@ -16,24 +16,35 @@ lib/python${MODPY_VERSION}/site-packages/urlwatch.egg-info/top_level.txt
 lib/python${MODPY_VERSION}/site-packages/urlwatch/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/urlwatch/${MODPY_PYCACHE}/
 lib/python${MODPY_VERSION}/site-packages/urlwatch/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/urlwatch/${MODPY_PYCACHE}command.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/urlwatch/${MODPY_PYCACHE}config.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/urlwatch/${MODPY_PYCACHE}filters.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/urlwatch/${MODPY_PYCACHE}handler.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/urlwatch/${MODPY_PYCACHE}html2txt.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/urlwatch/${MODPY_PYCACHE}ical2txt.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/urlwatch/${MODPY_PYCACHE}jobs.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/urlwatch/${MODPY_PYCACHE}mailer.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/urlwatch/${MODPY_PYCACHE}main.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/urlwatch/${MODPY_PYCACHE}migration.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/urlwatch/${MODPY_PYCACHE}reporters.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/urlwatch/${MODPY_PYCACHE}storage.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/urlwatch/${MODPY_PYCACHE}util.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/urlwatch/${MODPY_PYCACHE}worker.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/urlwatch/command.py
+lib/python${MODPY_VERSION}/site-packages/urlwatch/config.py
+@comment lib/python${MODPY_VERSION}/site-packages/urlwatch/config.py.orig
 lib/python${MODPY_VERSION}/site-packages/urlwatch/filters.py
 lib/python${MODPY_VERSION}/site-packages/urlwatch/handler.py
 lib/python${MODPY_VERSION}/site-packages/urlwatch/html2txt.py
 lib/python${MODPY_VERSION}/site-packages/urlwatch/ical2txt.py
 lib/python${MODPY_VERSION}/site-packages/urlwatch/jobs.py
 lib/python${MODPY_VERSION}/site-packages/urlwatch/mailer.py
+lib/python${MODPY_VERSION}/site-packages/urlwatch/main.py
+lib/python${MODPY_VERSION}/site-packages/urlwatch/migration.py
 lib/python${MODPY_VERSION}/site-packages/urlwatch/reporters.py
 lib/python${MODPY_VERSION}/site-packages/urlwatch/storage.py
 lib/python${MODPY_VERSION}/site-packages/urlwatch/util.py
+lib/python${MODPY_VERSION}/site-packages/urlwatch/worker.py
 @man man/man1/urlwatch.1
 share/examples/urlwatch/
 share/examples/urlwatch/hooks.py.example