Index: /trunk/src/VBox/Additions/linux/installer/vboxadd-service.sh
===================================================================
--- /trunk/src/VBox/Additions/linux/installer/vboxadd-service.sh	(revision 69006)
+++ /trunk/src/VBox/Additions/linux/installer/vboxadd-service.sh	(revision 69007)
@@ -14,4 +14,7 @@
 #
 
+# X-Conflicts-With is our own invention, which we use when converting to
+# a systemd unit.
+
 # chkconfig: 345 35 65
 # description: VirtualBox Additions service
@@ -23,4 +26,5 @@
 # Default-Start:  2 3 4 5
 # Default-Stop:   0 1 6
+# X-Conflicts-With: systemd-timesyncd.service
 # Description:    VirtualBox Additions Service
 ### END INIT INFO
Index: /trunk/src/VBox/Installer/linux/routines.sh
===================================================================
--- /trunk/src/VBox/Installer/linux/routines.sh	(revision 69006)
+++ /trunk/src/VBox/Installer/linux/routines.sh	(revision 69007)
@@ -123,4 +123,5 @@
     test -n "${unit_path}" || \
         { echo "$self: systemd unit path not found" >&2 && return 1; }
+    conflicts=`sed -n 's/# *X-Conflicts-With: *\(.*\)/\1/p' "${script}" | sed 's/\$[a-z]*//'`
     description=`sed -n 's/# *Short-Description: *\(.*\)/\1/p' "${script}"`
     required=`sed -n 's/# *Required-Start: *\(.*\)/\1/p' "${script}" | sed 's/\$[a-z]*//'`
@@ -138,5 +139,5 @@
 Before=${targets}shutdown.target ${before}
 After=${after}
-Conflicts=shutdown.target
+Conflicts=shutdown.target ${conflicts}
 
 [Service]