diff --git a/php-snuffleupagus/Makefile b/php-snuffleupagus/Makefile
index 00d6cd9c39..77eda5b45d 100644
--- a/php-snuffleupagus/Makefile
+++ b/php-snuffleupagus/Makefile
@@ -1,7 +1,7 @@
 # $NetBSD$
 #
 MODNAME=		snuffleupagus
-PECL_VERSION=		0.5.1
+PECL_VERSION=		0.6.0
 CATEGORIES+=		security
 
 # See TODO
@@ -12,6 +12,7 @@ HOMEPAGE=		https://snuffleupagus.readthedocs.io/
 COMMENT=		Security module for PHP7
 LICENSE=		gnu-lgpl-v3
 
+WRKSRC=			${WRKDIR}/${MODNAME}
 MODULESDIR=		${WRKSRC}/src/modules
 PHPSETUPSUBDIR=		src
 CONFIGURE_DIRS=		src
diff --git a/php-snuffleupagus/TODO b/php-snuffleupagus/TODO
index 9cff8e2414..8be9517276 100644
--- a/php-snuffleupagus/TODO
+++ b/php-snuffleupagus/TODO
@@ -4,5 +4,3 @@ distfile from upstream.
 Look further into the need for the memcpy patch.
 
 Add an example rules file.
-
-Failing tests expected?
diff --git a/php-snuffleupagus/distinfo b/php-snuffleupagus/distinfo
index 79404840c6..c1f31ca20a 100644
--- a/php-snuffleupagus/distinfo
+++ b/php-snuffleupagus/distinfo
@@ -1,7 +1,7 @@
 $NetBSD: distinfo,v 1.2 2015/11/04 01:18:01 agc Exp $
 
-SHA1 (php-snuffleupagus/snuffleupagus-0.5.1.tgz) = 6befe3e7009419e4dd6b53a909c9a55d4d03cb07
-RMD160 (php-snuffleupagus/snuffleupagus-0.5.1.tgz) = b5e7dcd8e1437867df8b32084d8a733197dbb09d
-SHA512 (php-snuffleupagus/snuffleupagus-0.5.1.tgz) = 439993885453cd840d9be3e56d2e28ffe711a647db266c2848b5d5248017a139ca101b4c447b1c2a5a322ac77ccc15af5010d6d633207163350c26cb0de8ada3
-Size (php-snuffleupagus/snuffleupagus-0.5.1.tgz) = 11945453 bytes
-SHA1 (patch-src_sp__utils.c) = 03f3e1f6b4c08cf4aaad38be89907ac992590a8e
+SHA1 (php-snuffleupagus/snuffleupagus-0.6.0.tgz) = 8c480ac4aba8fb4b3407100992e488bb4677c831
+RMD160 (php-snuffleupagus/snuffleupagus-0.6.0.tgz) = 99ca7c719d64fda61b73ed0910151106b7832129
+SHA512 (php-snuffleupagus/snuffleupagus-0.6.0.tgz) = 57f2bd3513e6171e2f4bc7baeaf001360e98b5103aceb3cf7cd83cd74ae5a44919762da2373073a6bc3a4e5f00f5289367aa5c12f86256b91736ac78ae9e0524
+Size (php-snuffleupagus/snuffleupagus-0.6.0.tgz) = 11944389 bytes
+SHA1 (patch-src_sp__utils.c) = 3c0630966997318e2b9ae2c8223e7f7762860db6
diff --git a/php-snuffleupagus/patches/patch-src_sp__utils.c b/php-snuffleupagus/patches/patch-src_sp__utils.c
index c7832bb5bd..a5485117a2 100644
--- a/php-snuffleupagus/patches/patch-src_sp__utils.c
+++ b/php-snuffleupagus/patches/patch-src_sp__utils.c
@@ -1,12 +1,12 @@
 $NetBSD$
 
-Work around build error with nested macro.
+Work around build error with nested macro:
 
-  'macro "memcpy" requires 3 arguments, but only 2 given'
+'macro "memcpy" requires 3 arguments, but only 2 given'
 
---- src/sp_utils.c.orig	2019-06-12 14:42:36.000000000 +0000
+--- src/sp_utils.c.orig	2020-08-12 14:16:28.000000000 +0000
 +++ src/sp_utils.c
-@@ -353,7 +353,7 @@ int hook_function(const char* original_n
+@@ -422,7 +422,7 @@ int hook_function(const char* original_n
        return FAILURE;
      }
      memcpy(mb_name, "mb_", sizeof("mb_") - 1);