diff -Nru zentyal-webserver-3.1.4/ChangeLog zentyal-webserver-3.1.5/ChangeLog
--- zentyal-webserver-3.1.4/ChangeLog	2013-08-17 09:55:50.000000000 +0000
+++ zentyal-webserver-3.1.5/ChangeLog	2013-09-17 09:18:03.000000000 +0000
@@ -1,3 +1,5 @@
+3.1.5
+	+ Override daemons when migrating from 3.0
 3.1.4
 	+ Avoid crash if zentyal-users is not installed
 3.1.3
diff -Nru zentyal-webserver-3.1.4/debian/changelog zentyal-webserver-3.1.5/debian/changelog
--- zentyal-webserver-3.1.4/debian/changelog	2013-08-17 09:55:50.000000000 +0000
+++ zentyal-webserver-3.1.5/debian/changelog	2013-09-17 09:18:03.000000000 +0000
@@ -1,3 +1,9 @@
+zentyal-webserver (3.1.5) precise; urgency=low
+
+  * New upstream release
+
+ -- José A. Calvo <jacalvo@zentyal.com>  Tue, 17 Sep 2013 11:18:03 +0200
+
 zentyal-webserver (3.1.4) precise; urgency=low
 
   * New upstream release
diff -Nru zentyal-webserver-3.1.4/src/EBox/WebServer.pm zentyal-webserver-3.1.5/src/EBox/WebServer.pm
--- zentyal-webserver-3.1.4/src/EBox/WebServer.pm	2013-08-17 09:55:50.000000000 +0000
+++ zentyal-webserver-3.1.5/src/EBox/WebServer.pm	2013-09-17 09:18:03.000000000 +0000
@@ -173,6 +173,11 @@
         $settings->setValue(port      => $port);
         $settings->setValue(enableDir => EBox::WebServer::Model::GeneralSettings::DefaultEnableDir());
     }
+
+    # Upgrade from 3.0
+    if (defined ($version) and (EBox::Util::Version::compare($version, '3.1') < 0)) {
+        $self->_overrideDaemons() if $self->configured();
+    }
 }
 
 # Method: depends