diff --git a/srcpkgs/php/patches/php-fpm.conf.in.patch b/srcpkgs/php/patches/php-fpm.conf.in.patch
deleted file mode 100644
index 81eabf73fc..0000000000
--- a/srcpkgs/php/patches/php-fpm.conf.in.patch
+++ /dev/null
@@ -1,52 +0,0 @@
---- sapi/fpm/php-fpm.conf.in	2014-04-29 10:04:30.000000000 +0200
-+++ sapi/fpm/php-fpm.conf.in	2014-05-01 07:36:14.762839158 +0200
-@@ -12,7 +12,7 @@
- ; Relative path can also be used. They will be prefixed by:
- ;  - the global prefix if it's been set (-p argument)
- ;  - @prefix@ otherwise
--;include=etc/fpm.d/*.conf
-+;include=/etc/php/fpm.d/*.conf
- 
- ;;;;;;;;;;;;;;;;;;
- ; Global Options ;
-@@ -22,7 +22,7 @@
- ; Pid file
- ; Note: the default prefix is @EXPANDED_LOCALSTATEDIR@
- ; Default Value: none
--;pid = run/php-fpm.pid
-+pid = /run/php-fpm/php-fpm.pid
- 
- ; Error log file
- ; If it's set to "syslog", log is sent to syslogd instead of being written
-@@ -156,7 +156,8 @@
- ;                            specific port;
- ;   '/path/to/unix/socket' - to listen on a unix socket.
- ; Note: This value is mandatory.
--listen = 127.0.0.1:9000
-+;listen = 127.0.0.1:9000
-+listen = /run/php-fpm/php-fpm.sock
- 
- ; Set listen(2) backlog.
- ; Default Value: 65535 (-1 on FreeBSD and OpenBSD)
-@@ -167,9 +168,9 @@
- ; BSD-derived systems allow connections regardless of permissions. 
- ; Default Values: user and group are set as the running user
- ;                 mode is set to 0660
--;listen.owner = @php_fpm_user@
--;listen.group = @php_fpm_group@
--;listen.mode = 0660
-+listen.owner = @php_fpm_user@
-+listen.group = @php_fpm_group@
-+listen.mode = 0660
-  
- ; List of ipv4 addresses of FastCGI clients which are allowed to connect.
- ; Equivalent to the FCGI_WEB_SERVER_ADDRS environment variable in the original
-@@ -466,7 +467,7 @@
- ; Chdir to this directory at the start.
- ; Note: relative path can be used.
- ; Default Value: current directory or / when chroot
--;chdir = /var/www
-+;chdir = /srv/http
-  
- ; Redirect worker stdout and stderr into main error log. If not set, stdout and
- ; stderr will be redirected to /dev/null according to FastCGI specs.
diff --git a/srcpkgs/php/patches/php.ini.patch b/srcpkgs/php/patches/php.ini.patch
index 3c6d11785e..bfc26324c7 100644
--- a/srcpkgs/php/patches/php.ini.patch
+++ b/srcpkgs/php/patches/php.ini.patch
@@ -1,6 +1,6 @@
---- php.ini-production	2014-04-29 10:04:30.000000000 +0200
-+++ php.ini-production	2014-05-01 07:32:06.928871679 +0200
-@@ -296,7 +296,7 @@
+--- php.ini-production.orig	2014-08-27 15:31:35.000000000 +0200
++++ php.ini-production	2014-09-30 17:56:35.704994951 +0200
+@@ -296,7 +296,7 @@ serialize_precision = 17
  ; or per-virtualhost web server configuration file. This directive is
  ; *NOT* affected by whether Safe Mode is turned On or Off.
  ; http://php.net/open-basedir
@@ -9,7 +9,7 @@
  
  ; This directive allows you to disable certain functions for security reasons.
  ; It receives a comma-delimited list of function names. This directive is
-@@ -693,7 +693,7 @@
+@@ -709,7 +709,7 @@ default_charset = "UTF-8"
  ;;;;;;;;;;;;;;;;;;;;;;;;;
  
  ; UNIX: "/path1:/path2"
@@ -18,7 +18,7 @@
  ;
  ; Windows: "\path1;\path2"
  ;include_path = ".;c:\php\includes"
-@@ -716,7 +716,7 @@
+@@ -732,7 +732,7 @@ user_dir =
  
  ; Directory in which the loadable extensions (modules) reside.
  ; http://php.net/extension-dir
@@ -27,7 +27,7 @@
  ; On windows:
  ; extension_dir = "ext"
  
-@@ -854,50 +854,48 @@
+@@ -870,49 +870,48 @@ default_socket_timeout = 60
  ; If you only provide the name of the extension, PHP will look for it in its
  ; default extension directory.
  ;
@@ -51,8 +51,7 @@
 -;extension=php_exif.dll      ; Must be after mbstring as it depends on it
 -;extension=php_mysql.dll
 -;extension=php_mysqli.dll
--;extension=php_oci8.dll      ; Use with Oracle 10gR2 Instant Client
--;extension=php_oci8_11g.dll  ; Use with Oracle 11gR2 Instant Client
+-;extension=php_oci8_12c.dll  ; Use with Oracle Database 12c Instant Client
 -;extension=php_openssl.dll
 -;extension=php_pdo_firebird.dll
 -;extension=php_pdo_mysql.dll
diff --git a/srcpkgs/php/template b/srcpkgs/php/template
index 89b217be08..11afa9d63b 100644
--- a/srcpkgs/php/template
+++ b/srcpkgs/php/template
@@ -1,6 +1,6 @@
 # Template build file for 'php'
 pkgname=php
-version=5.5.16
+version=5.6.0
 revision=1
 short_desc="An HTML-embedded scripting language"
 license="PHP"
@@ -15,7 +15,7 @@ makedepends="postgresql-libs-devel libldap-devel libvpx-devel sqlite-devel
  readline-devel>=6.3 libmysqlclient-devel"
 conf_files="/etc/php/php.ini"
 distfiles="http://www.php.net/distributions/php-${version}.tar.gz"
-checksum=cdea80ab1b0466f4656b46155e341b700799e78569a5cc582eeaededb448086c
+checksum=284b85376c630a6a7163e5278d64b8526fa1324fe5fd5d21174b54e2c056533f
 
 nocross=yes
 lib32disabled=yes