diff --git a/.gitignore b/.gitignore
index 71d35db..2c3e3ee 100644
--- a/.gitignore
+++ b/.gitignore
@@ -16,3 +16,4 @@ php-7.1.*.xz
 /php-7.0.16.tar.xz
 /php-7.0.17RC1.tar.xz
 /php-7.0.17.tar.xz
+/php-7.0.18.tar.xz
diff --git a/php-7.0.0-systzdata-v14.patch b/php-7.0.0-systzdata-v14.patch
index 8ff32c8..dd6b784 100644
--- a/php-7.0.0-systzdata-v14.patch
+++ b/php-7.0.0-systzdata-v14.patch
@@ -1,3 +1,6 @@
+# License: MIT
+# http://opensource.org/licenses/MIT
+
 Add support for use of the system timezone database, rather
 than embedding a copy.  Discussed upstream but was not desired.
 
diff --git a/php.spec b/php.spec
index 3e66575..9f0404b 100644
--- a/php.spec
+++ b/php.spec
@@ -63,12 +63,14 @@
 
 Summary: PHP scripting language for creating dynamic web sites
 Name: php
-Version: 7.0.17
+Version: 7.0.18
 Release: %{?rcver:0.}%{rpmrel}%{?rcver:.%{rcver}}%{?dist}
 # All files licensed under PHP version 3.01, except
 # Zend is licensed under Zend
 # TSRM is licensed under BSD
-License: PHP and Zend and BSD
+# main/snprintf.c, main/spprintf.c and main/rfc1867.c are ASL 1.0
+# ext/date/lib is MIT
+License: PHP and Zend and BSD and MIT and ASL 1.0
 Group: Development/Languages
 URL: http://www.php.net/
 
@@ -186,10 +188,6 @@ The php-dbg package contains the interactive PHP debugger.
 %package fpm
 Group: Development/Languages
 Summary: PHP FastCGI Process Manager
-# All files licensed under PHP version 3.01, except
-# Zend is licensed under Zend
-# TSRM and fpm are licensed under BSD
-License: PHP and Zend and BSD
 BuildRequires: libacl-devel
 Requires: php-common%{?_isa} = %{version}-%{release}
 Requires(pre): /usr/sbin/useradd
@@ -220,8 +218,7 @@ Summary: Common files for PHP
 # All files licensed under PHP version 3.01, except
 # fileinfo is licensed under PHP version 3.0
 # regex, libmagic are licensed under BSD
-# main/snprintf.c, main/spprintf.c and main/rfc1867.c are ASL 1.0
-License: PHP and BSD and ASL 1.0
+License: PHP and BSD
 # ABI/API check - Arch specific
 Provides: php(api) = %{apiver}%{isasuffix}
 Provides: php(zend-abi) = %{zendver}%{isasuffix}
@@ -734,6 +731,7 @@ cp ext/mbstring/ucgendat/OPENLDAP_LICENSE ucgendat_LICENSE
 cp ext/fileinfo/libmagic/LICENSE libmagic_LICENSE
 cp ext/phar/LICENSE phar_LICENSE
 cp ext/bcmath/libbcmath/COPYING.LIB libbcmath_COPYING
+cp ext/date/lib/LICENSE.rst timelib_LICENSE
 
 # Multiple builds for multiple SAPIs
 mkdir build-cgi build-apache build-embedded \
@@ -1357,9 +1355,10 @@ rm -f README.{Zeus,QNX,CVS-RULES}
 
 %files common -f files.common
 %doc CODING_STANDARDS CREDITS EXTENSIONS NEWS README*
-%license LICENSE Zend/ZEND_* TSRM_LICENSE
+%license LICENSE TSRM_LICENSE
 %license libmagic_LICENSE
 %license phar_LICENSE
+%license timelib_LICENSE
 %doc php.ini-*
 %config(noreplace) %{_sysconfdir}/php.ini
 %dir %{_sysconfdir}/php.d
@@ -1486,6 +1485,10 @@ rm -f README.{Zeus,QNX,CVS-RULES}
 
 
 %changelog
+* Tue Apr 11 2017 Remi Collet <remi@fedoraproject.org> 7.0.18-1
+- Update to 7.0.18 - http://www.php.net/releases/7_0_18.php
+- timelib License is MIT
+
 * Wed Mar 15 2017 Remi Collet <remi@fedoraproject.org> 7.0.17-1
 - Update to 7.0.17 - http://www.php.net/releases/7_0_17.php
 
diff --git a/sources b/sources
index b568539..fa87cb0 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (php-7.0.17.tar.xz) = 9d8072a958046a554f242be1fa6f857b4d9605e383fc21078181249a37c24a1ea0ec70de808ac3e174b51e7ecd1e12bdc49da37a357610813388e5328c8c8816
+SHA512 (php-7.0.18.tar.xz) = 7188679dbbae27ab319d036bbee7d80f412cbb61ae83e38d6f1aa8e3f003a502c966adbc3a64481b0c94fd509ea991caae24517aed524a2b32cc91efffc01a36