diff --git a/debian/changelog b/debian/changelog
index be2ebe28..f87ceb7b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+davical (1.1.4-2) unstable; urgency=medium
+
+  * Update to work with both php5 and php7, mainly based on the Ubuntu patch
+    by Nishanth Aravamudan (thanks!). Closes: #821673, #821477
+  * Declare compliance with Debian Policy 3.9.8
+
+ -- Florian Schlichting <fsfs@debian.org>  Tue, 19 Apr 2016 21:52:33 +0200
+
 davical (1.1.4-1) unstable; urgency=medium
 
   * New upstream release (closes: #703128, #703294, #703287, #656020, #764915)
diff --git a/debian/control b/debian/control
index b6c6b308..ceb928ef 100644
--- a/debian/control
+++ b/debian/control
@@ -4,11 +4,11 @@ Priority: extra
 Maintainer: Davical Development Team <davical-devel@lists.sourceforge.net>
 Uploaders: Andrew McMillan <awm@debian.org>,
  Florian Schlichting <fsfs@debian.org>
-Standards-Version: 3.9.6
+Standards-Version: 3.9.8
 Build-Depends: debhelper (>= 9),
  libawl-php (>= 0.56-1~), libawl-php (<< 0.57),
  gettext,
- php5-cli,
+ php-cli | php5-cli,
  rst2pdf
 Vcs-git: https://gitlab.com/davical-project/davical.git
 Vcs-browser: https://gitlab.com/davical-project/davical
@@ -20,13 +20,13 @@ Depends: ${misc:Depends}, ${perl:Depends},
  libawl-php (>= 0.56-1~), libawl-php (<< 0.57),
  libdbd-pg-perl,
  libyaml-perl,
- php5,
- php5-cli,
- php5-pgsql,
+ php | php5,
+ php-cli | php5-cli,
+ php-pgsql | php5-pgsql,
  postgresql-client
-Recommends: php5-curl,
+Recommends: php-curl | php5-curl,
  postgresql
-Suggests: php5-ldap
+Suggests: php-ldap | php5-ldap
 Description: PHP CalDAV and CardDAV Server
  The DAViCal CalDAV Server is designed to store CalDAV calendars and
  CardDAV addressbooks, such as those from Evolution, Sunbird/Lightning,
diff --git a/debian/patches/php7.patch b/debian/patches/php7.patch
new file mode 100644
index 00000000..6baa8c6d
--- /dev/null
+++ b/debian/patches/php7.patch
@@ -0,0 +1,25 @@
+Description: Update to PHP7.0 naming
+Author: Nishanth Aravamudan <nish.aravamudan@canonical.com>
+
+--- a/Makefile
++++ b/Makefile
+@@ -53,7 +53,7 @@
+ 
+ .PHONY: test
+ test:
+-	@for PHP in htdocs/*.php inc/*.php; do php5 -l $${PHP} | grep -v 'No syntax errors detected' >> test-syntax; done; \
++	@for PHP in htdocs/*.php inc/*.php; do php -l $${PHP} | grep -v 'No syntax errors detected' >> test-syntax; done; \
+ 	    if [ -s test-syntax ]; then \
+ 	    	cat test-syntax >&2; \
+ 		rm test-syntax; \
+--- a/inc/drivers_imap_pam.php
++++ b/inc/drivers_imap_pam.php
+@@ -13,7 +13,7 @@
+ 
+ // The PHP interpreter will die quietly unless satisfied. This provides user feedback instead.
+ if (!function_exists('imap_open')) {
+-  die("drivers_imap_pam: php5-imap required.");
++  die("drivers_imap_pam: php-imap required.");
+ }
+ 
+ require_once("auth-functions.php");
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 00000000..65921cc5
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+php7.patch