diff -Nru zentyal-ntp-3.1.1/ChangeLog zentyal-ntp-3.1.2/ChangeLog
--- zentyal-ntp-3.1.1/ChangeLog	2013-08-05 10:23:18.000000000 +0000
+++ zentyal-ntp-3.1.2/ChangeLog	2013-09-17 09:17:00.000000000 +0000
@@ -1,3 +1,5 @@
+3.1.2
+	+ Override daemons when migrating from 3.0
 3.1.1
 	+ Added menu icon
 3.1
diff -Nru zentyal-ntp-3.1.1/debian/changelog zentyal-ntp-3.1.2/debian/changelog
--- zentyal-ntp-3.1.1/debian/changelog	2013-08-05 10:23:19.000000000 +0000
+++ zentyal-ntp-3.1.2/debian/changelog	2013-09-17 09:17:01.000000000 +0000
@@ -1,3 +1,9 @@
+zentyal-ntp (3.1.2) precise; urgency=low
+
+  * New upstream release
+
+ -- José A. Calvo <jacalvo@zentyal.com>  Tue, 17 Sep 2013 11:17:01 +0200
+
 zentyal-ntp (3.1.1) precise; urgency=low
 
   * New upstream release
diff -Nru zentyal-ntp-3.1.1/src/EBox/NTP.pm zentyal-ntp-3.1.2/src/EBox/NTP.pm
--- zentyal-ntp-3.1.1/src/EBox/NTP.pm	2013-08-05 10:23:18.000000000 +0000
+++ zentyal-ntp-3.1.2/src/EBox/NTP.pm	2013-09-17 09:17:00.000000000 +0000
@@ -146,6 +146,11 @@
         }
         $fw->saveConfigRecursive();
     }
+
+    # Upgrade from 3.0
+    if (defined ($version) and (EBox::Util::Version::compare($version, '3.1') < 0)) {
+        $self->_overrideDaemons() if $self->configured();
+    }
 }
 
 sub _syncDate