diff --git a/www/piwigo/Makefile b/www/piwigo/Makefile
index 768416713f50..770bd3136939 100644
--- a/www/piwigo/Makefile
+++ b/www/piwigo/Makefile
@@ -1,81 +1,82 @@
 PORTNAME=	piwigo
 DISTVERSION=	12.3.0
+PORTREVISION=	1
 CATEGORIES=	www
 MASTER_SITES=	https://piwigo.org/download/dlcounter.php?code=${PORTVERSION}&/
 
 MAINTAINER=	netchild@FreeBSD.org
 COMMENT=	PHP based Web Gallery
 
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/doc/COPYING
 
 RUN_DEPENDS+=	${LOCALBASE}/lib/php/${PHP_EXT_DIR}/sodium.so:security/pecl-libsodium@${PHP_FLAVOR}
 
 USES=		cpe php:web zip
 USE_PHP=	ctype dom exif filter gd hash iconv json mbstring mysqli \
 		openssl pcre pdo session simplexml spl tokenizer xml zlib
 
 NO_ARCH=	yes
 NO_BUILD=	yes
-SUB_FILES=	pkg-deinstall pkg-message
+SUB_FILES=	pkg-message
 SUB_LIST+=	CHOWN="${CHOWN}" \
 		CP="${CP}" \
 		MKDIR="${MKDIR}" \
 		TOUCH="${TOUCH}" \
 		WWWGRP="${WWWGRP}" \
 		WWWOWN="${WWWOWN}"
 
 WRKSRC=		${WRKDIR}/${PORTNAME}
 
 PLIST_SUB+=	CHOWN="${CHOWN}" \
 		WWWGRP="${WWWGRP}" \
 		WWWOWN="${WWWOWN}"
 PORTDOCS=	README_ca.txt README_en.txt README_fr.txt
 
 OPTIONS_DEFINE=		DOCS EXAMPLES
 OPTIONS_GROUP=		OPT
 OPTIONS_GROUP_OPT=	EXIFTOOL FFMPEG IMAGICK MEDIAINFO
 
 EXIFTOOL_DESC=	exiftool support (for plugins)
 IMAGICK_DESC=	${IMAGEMAGICK_DESC}
 MEDIAINFO_DESC=	mediainfo support (for plugins)
 OPT_DESC=	Optional dependencies
 
 EXIFTOOL_RUN_DEPENDS=	exiftool:graphics/p5-Image-ExifTool
 FFMPEG_RUN_DEPENDS=	ffmpeg:multimedia/ffmpeg
 IMAGICK_RUN_DEPENDS=	${LOCALBASE}/lib/php/${PHP_EXT_DIR}/imagick.so:graphics/pecl-imagick@${PHP_FLAVOR}
 MEDIAINFO_RUN_DEPENDS=	mediainfo:multimedia/mediainfo
 
 .include <bsd.port.pre.mk>
 
 pre-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}/
 	@cd ${WRKSRC}/doc/ && ${INSTALL_DATA} ${PORTDOCS} ${STAGEDIR}${DOCSDIR}/
 
 pre-install-EXAMPLES-on:
 	@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}/
 	@cd ${WRKSRC}/tools/ && ${COPYTREE_SHARE} . ${STAGEDIR}${EXAMPLESDIR}/
 
 do-install:
 	@cd ${WRKSRC}/doc/ && ${RM} ${PORTDOCS}
 	@${RM} -r ${WRKSRC}/tools ${WRKSRC}/_data/dummy.txt
 	@${INSTALL} -d ${STAGEDIR}${WWWDIR}
 	@${TAR} -C ${WRKSRC} -cf - . | \
 	${TAR} --unlink -C ${STAGEDIR}${WWWDIR} -xf -
 
 gen-plist:
 	${ECHO} '@dir(%%WWWOWN%%,%%WWWGRP%%,750) %%WWWDIR%%/language' > ${PLIST}.new
 	${ECHO} '@dir(%%WWWOWN%%,%%WWWGRP%%,750) %%WWWDIR%%/plugins' >> ${PLIST}.new
 	${ECHO} '@dir(%%WWWOWN%%,%%WWWGRP%%,750) %%WWWDIR%%/themes' >> ${PLIST}.new
 	${FIND} ${STAGEDIR}${PREFIX} -type f -o -type l | \
 	    ${SED} -e "s:${STAGEDIR}${PREFIX}/::g ; \
 	        s:www/piwigo/language:@(%%WWWOWN%%,%%WWWGRP%%,750) %%WWWDIR%%/language:g ; \
 		s:www/piwigo/plugins:@(%%WWWOWN%%,%%WWWGRP%%,750) %%WWWDIR%%/plugins:g ; \
 		s:www/piwigo/themes:@(%%WWWOWN%%,%%WWWGRP%%,750) %%WWWDIR%%/themes:g ; \
 	    	s:www/piwigo:%%WWWDIR%%:g ; \
 		s:share/examples/piwigo:%%PORTEXAMPLES%%%%EXAMPLESDIR%%:g ;" |  \
 	    ${GREP} -v -E '^share/(doc|licenses)/' | ${SORT} >> ${PLIST}.new
 	${ECHO} '@dir(%%WWWOWN%%,%%WWWGRP%%,777) %%WWWDIR%%/_data' >> ${PLIST}.new
 	${ECHO} '@dir(%%WWWOWN%%,%%WWWGRP%%,750) %%WWWDIR%%/upload' >> ${PLIST}.new
 
 .include <bsd.port.post.mk>
diff --git a/www/piwigo/files/pkg-deinstall.in b/www/piwigo/files/pkg-deinstall.in
deleted file mode 100644
index ca60490f25f8..000000000000
--- a/www/piwigo/files/pkg-deinstall.in
+++ /dev/null
@@ -1,20 +0,0 @@
-#! /bin/sh
-
-PATH=/bin:/usr/sbin:/usr/bin:/usr/sbin
-
-WEBAPP_DIR="%%WWWDIR%%"
-ECHO_CMD="echo"
-
-post-deinstall() {
-	${ECHO_CMD} "WARNING: If you intend *NOT* use this package anymore,"
-	${ECHO_CMD} "  you may need to remove the following directory manually:"
-	${ECHO_CMD} "  ${WEBAPP_DIR}"
-	${ECHO_CMD} "  and delete the application database."
-	${ECHO_CMD}
-}
-
-case $2 in
-	POST-DEINSTALL)
-		post-deinstall
-		;;
-esac
diff --git a/www/piwigo/files/pkg-message.in b/www/piwigo/files/pkg-message.in
index d8c414397746..49a5d823d382 100644
--- a/www/piwigo/files/pkg-message.in
+++ b/www/piwigo/files/pkg-message.in
@@ -1,42 +1,50 @@
 [
 { type: install
   message: <<EOM
 The Piwigo Photo Gallery has been installed in the directory
 %%WWWDIR%%
 and optionally, with the documentation at
 %%DOCSDIR%%
 and the content of the tools directory at
 %%EXAMPLESDIR%%.
 
 If this is a new installation, don't forget to verify that your
 PHP configuration is OK and that you have an MySQL database.
 The local directory contains the empty structure
 used to store local configuration.
 
 If you are upgrading, alwyas read the documentation
 on the site. There may be special steps you need to
 bring your site to the new version.
 
 Make sure the ownership and mode of the installation
 directores and files match your intended use.
 
 If you included ImageMagick, don't forget to set
 $conf['ext_imagick_dir'] = '%%LOCALBASE%%/bin/';
 in your local config.
 
 You must add appropriate configuration directives to your
 apache configuration file (%%PREFIX%%/etc/apache/httpd.conf).
 A typical configuration would be:
 
     Alias /gallery/ "%%WWWDIR%%/"
 
     <Directory "%%WWWDIR%%">
 	AllowOverride None
 	Order allow,deny
 	Allow from all
     </Directory>
 
 For installation and upgrade information, check the readme file.
 EOM
+},
+{ type: remove
+  message: <<EOM
+WARNING: If you intend *NOT* use this package anymore,
+  you may need to remove the following directory manually:
+  %%WWWDIR%%
+  and delete the application database.
+EOM
 }
 ]