diff --git a/README.rst b/README.rst
index 66a1509..b7d6a87 100644
--- a/README.rst
+++ b/README.rst
@@ -70,6 +70,11 @@ php-common, which will get installed with the main php package.
 
 Installs the php-dev package.
 
+``php.fileinfo``
+-----------
+
+Installs the php-fileinfo package and enables it.
+
 ``php.fpm``
 -----------
 
@@ -196,6 +201,11 @@ Installs the php-suhosin package.
 
 Installs the php-sybase package for Sybase/MS-SQL. Debian / Ubuntu as RedHat has no similar package.
 
+``php.tokenizer``
+-----------
+
+Installs the php-tokenizer package and enables it.
+
 ``php.xml``
 -----------
 
diff --git a/php/ng/fileinfo.sls b/php/ng/fileinfo.sls
new file mode 100644
index 0000000..31567e0
--- /dev/null
+++ b/php/ng/fileinfo.sls
@@ -0,0 +1,2 @@
+{% set state = 'fileinfo' %}
+{% include "php/ng/installed.jinja" %}
diff --git a/php/ng/map.jinja b/php/ng/map.jinja
index 834048c..f902c88 100644
--- a/php/ng/map.jinja
+++ b/php/ng/map.jinja
@@ -2890,6 +2890,7 @@
                     'ctype': 'php' + freebsd_phpng_version + '-ctype',
                     'curl': 'php' + freebsd_phpng_version + '-curl',
                     'filter': 'php' + freebsd_phpng_version + '-filter',
+                    'fileinfo': 'php' + freebsd_phpng_version + '-fileinfo',
                     'gd': 'php' + freebsd_phpng_version + '-gd',
                     'hash': 'php' + freebsd_phpng_version + '-hash',
                     'json': 'php' + freebsd_phpng_version + '-json',
@@ -2904,6 +2905,7 @@
                     'session': 'php' + freebsd_phpng_version + '-session',
                     'snmp': 'php' + freebsd_phpng_version + '-snmp',
                     'temp_dir': '/tmp',
+                    'tokenizer': 'php' + freebsd_phpng_version + '-tokenizer',
                     'xml': 'php' + freebsd_phpng_version + '-xml',
                     'zip': 'php' + freebsd_phpng_version + '-zip',
                 },
diff --git a/php/ng/tokenizer.sls b/php/ng/tokenizer.sls
new file mode 100644
index 0000000..060b5a1
--- /dev/null
+++ b/php/ng/tokenizer.sls
@@ -0,0 +1,2 @@
+{% set state = 'tokenizer' %}
+{% include "php/ng/installed.jinja" %}