diff --git a/www/piwigo/Makefile b/www/piwigo/Makefile
index ba9a3b3400df..be8d5272cf4c 100644
--- a/www/piwigo/Makefile
+++ b/www/piwigo/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	piwigo
 DISTVERSION=	2.9.4
+PORTREVISION=	1
 CATEGORIES=	www
 MASTER_SITES=	http://piwigo.org/download/dlcounter.php?code=${PORTVERSION}&/
 
diff --git a/www/piwigo/files/patch-plugins_AdminTools_include_MultiView.class.php b/www/piwigo/files/patch-plugins_AdminTools_include_MultiView.class.php
new file mode 100644
index 000000000000..be2ae9eb7b1d
--- /dev/null
+++ b/www/piwigo/files/patch-plugins_AdminTools_include_MultiView.class.php
@@ -0,0 +1,20 @@
+--- plugins/AdminTools/include/MultiView.class.php.orig	2018-07-13 13:24:00 UTC
++++ plugins/AdminTools/include/MultiView.class.php
+@@ -38,7 +38,7 @@ class MultiView
+       );
+ 
+     $this->data_url_params = array_keys($this->data);
+-    $this->data_url_params = array_map(create_function('$d', 'return "ato_".$d;'), $this->data_url_params);
++    $this->data_url_params = array_map(function($d) { return 'ato_'.$d; }, $this->data_url_params);
+   }
+ 
+   /**
+@@ -226,7 +226,7 @@ class MultiView
+       }
+       if ($this->data['no_history'])
+       {
+-        $ret_false = create_function('', 'return false;');
++        $ret_false = function() {return false;};
+         add_event_handler('pwg_log_allowed', $ret_false);
+         add_event_handler('pwg_log_update_last_visit', $ret_false);
+       }
diff --git a/www/piwigo/files/patch-plugins_AdminTools_main.inc.php b/www/piwigo/files/patch-plugins_AdminTools_main.inc.php
new file mode 100644
index 000000000000..e625b4a5f681
--- /dev/null
+++ b/www/piwigo/files/patch-plugins_AdminTools_main.inc.php
@@ -0,0 +1,11 @@
+--- plugins/AdminTools/main.inc.php.orig	2018-07-13 13:24:01 UTC
++++ plugins/AdminTools/main.inc.php
+@@ -1,7 +1,7 @@
+ <?php
+ /*
+ Plugin Name: Admin Tools
+-Version: 2.9.4
++Version: 2.9.4.1
+ Description: Do some admin task from the public pages
+ Plugin URI: http://piwigo.org/ext/extension_view.php?eid=720
+ Author: Piwigo team
diff --git a/www/piwigo/files/patch-plugins_AdminTools_pem__metadata.txt b/www/piwigo/files/patch-plugins_AdminTools_pem__metadata.txt
new file mode 100644
index 000000000000..bc1e8cab5681
--- /dev/null
+++ b/www/piwigo/files/patch-plugins_AdminTools_pem__metadata.txt
@@ -0,0 +1,11 @@
+--- plugins/AdminTools/pem_metadata.txt.orig	2018-07-13 13:24:01 UTC
++++ plugins/AdminTools/pem_metadata.txt
+@@ -1,2 +1,4 @@
+-https://github.com/Piwigo/AdminTools.git
+-4161bc7f94819af01fea8631ad2b4258d00e5151 2017-12-11 18:11:36 +0100
+\ No newline at end of file
++File automatically created from SVN or Git repository.
++
++URL: https://github.com/Piwigo/AdminTools 
++Revision: d99a1378f9e05b087c9d590665e52ad5ccf2a41b (Mon Jul 16 17:38:42 2018 +0200)
+\ No newline at end of file