diff -Nru msxpertsuite-5.8.5/CMakeLists.txt msxpertsuite-5.8.6/CMakeLists.txt
--- msxpertsuite-5.8.5/CMakeLists.txt	2019-02-12 08:44:07.000000000 +0000
+++ msxpertsuite-5.8.6/CMakeLists.txt	2019-02-14 16:55:24.000000000 +0000
@@ -34,7 +34,7 @@
 # Basic information about project
 
 project(msXpertSuite)
-set(VERSION 5.8.5)
+set(VERSION 5.8.6)
 
 
 # Set additional project information
diff -Nru msxpertsuite-5.8.5/debian/changelog msxpertsuite-5.8.6/debian/changelog
--- msxpertsuite-5.8.5/debian/changelog	2019-02-12 07:59:24.000000000 +0000
+++ msxpertsuite-5.8.6/debian/changelog	2019-02-14 16:08:52.000000000 +0000
@@ -1,3 +1,17 @@
+msxpertsuite (5.8.6-1) unstable; urgency=low
+
+  * Reinstate partially all the conflicts/breaks/replaces statements for the
+    mspxertsuite-massxpert binary package. This ensures that upgrade of
+    massxpert from stable's version to this version does not stumble upon
+    overwriting blocks. Thanks to Andreas Beckmann
+    <anbe@debian.org> for reporting the piuparts log (Closes: #922287).
+
+  * Took advantage to update the
+    minexpert/org.msxpertsuite.minexpert.appdata.xml file (which justifies new
+    upstream version.
+
+ -- Filippo Rusconi <lopippo@debian.org>  Thu, 14 Feb 2019 17:08:52 +0100
+
 msxpertsuite (5.8.5-1) unstable; urgency=low
 
   * appdata fixes to the gpl version number (lintian warning).
diff -Nru msxpertsuite-5.8.5/debian/control msxpertsuite-5.8.6/debian/control
--- msxpertsuite-5.8.5/debian/control	2019-02-11 22:55:22.000000000 +0000
+++ msxpertsuite-5.8.6/debian/control	2019-02-14 16:08:52.000000000 +0000
@@ -95,6 +95,8 @@
 				 ${misc:Depends},
          msxpertsuite-massxpert-data-doc (>= ${source:Upstream-Version}),
          msxpertsuite-massxpert-data-doc (<< ${source:Upstream-Version}A~)
+Replaces: massxpert (<< 5.7.0)
+Breaks: massxpert (<< 5.7.0)
 Description: mass spectrometry software suite - massXpert
  msXpertSuite provides programs to model linear (bio-) polymer 
  chemistries, simulate mass spectral data, analyse and data-mine mass. 
diff -Nru msxpertsuite-5.8.5/doc/user-manuals/common/msxpertsuite-user-manuals.ent msxpertsuite-5.8.6/doc/user-manuals/common/msxpertsuite-user-manuals.ent
--- msxpertsuite-5.8.5/doc/user-manuals/common/msxpertsuite-user-manuals.ent	2019-02-12 08:44:07.000000000 +0000
+++ msxpertsuite-5.8.6/doc/user-manuals/common/msxpertsuite-user-manuals.ent	2019-02-14 16:55:24.000000000 +0000
@@ -1,6 +1,6 @@
 <!ENTITY YEAR "2019">
 <!ENTITY HOLDER "Filippo Rusconi &lt;msxpertsuite@msxpertsuite.org&gt;">
-<!ENTITY VERSION "5.8.5">
+<!ENTITY VERSION "5.8.6">
 
 <!ENTITY msxps "<application>msxpertsuite</application>">
 <!ENTITY msXps "<application>msXpertSuite</application>">
diff -Nru msxpertsuite-5.8.5/doc/user-manuals/massxpert/xml/msxpertsuite-user-manuals.ent msxpertsuite-5.8.6/doc/user-manuals/massxpert/xml/msxpertsuite-user-manuals.ent
--- msxpertsuite-5.8.5/doc/user-manuals/massxpert/xml/msxpertsuite-user-manuals.ent	2019-02-12 08:44:07.000000000 +0000
+++ msxpertsuite-5.8.6/doc/user-manuals/massxpert/xml/msxpertsuite-user-manuals.ent	2019-02-14 16:55:24.000000000 +0000
@@ -1,6 +1,6 @@
 <!ENTITY YEAR "2019">
 <!ENTITY HOLDER "Filippo Rusconi &lt;msxpertsuite@msxpertsuite.org&gt;">
-<!ENTITY VERSION "5.8.5">
+<!ENTITY VERSION "5.8.6">
 
 <!ENTITY msxps "<application>msxpertsuite</application>">
 <!ENTITY msXps "<application>msXpertSuite</application>">
diff -Nru msxpertsuite-5.8.5/doc/user-manuals/minexpert/xml/msxpertsuite-user-manuals.ent msxpertsuite-5.8.6/doc/user-manuals/minexpert/xml/msxpertsuite-user-manuals.ent
--- msxpertsuite-5.8.5/doc/user-manuals/minexpert/xml/msxpertsuite-user-manuals.ent	2019-02-12 08:44:07.000000000 +0000
+++ msxpertsuite-5.8.6/doc/user-manuals/minexpert/xml/msxpertsuite-user-manuals.ent	2019-02-14 16:55:24.000000000 +0000
@@ -1,6 +1,6 @@
 <!ENTITY YEAR "2019">
 <!ENTITY HOLDER "Filippo Rusconi &lt;msxpertsuite@msxpertsuite.org&gt;">
-<!ENTITY VERSION "5.8.5">
+<!ENTITY VERSION "5.8.6">
 
 <!ENTITY msxps "<application>msxpertsuite</application>">
 <!ENTITY msXps "<application>msXpertSuite</application>">
Binary files /tmp/tmp6uYcnm/M81ePNjqLq/msxpertsuite-5.8.5/images/splashscreen.png and /tmp/tmp6uYcnm/6A1xTkKvXW/msxpertsuite-5.8.6/images/splashscreen.png differ
diff -Nru msxpertsuite-5.8.5/images/splashscreen.svg msxpertsuite-5.8.6/images/splashscreen.svg
--- msxpertsuite-5.8.5/images/splashscreen.svg	2019-02-12 08:44:07.000000000 +0000
+++ msxpertsuite-5.8.6/images/splashscreen.svg	2019-02-14 16:55:24.000000000 +0000
@@ -150,6 +150,6 @@
          id="tspan4496"
          x="404.5647"
          y="963.23505"
-         style="stroke-width:0.33261424px">Suite version 5.8.5</tspan></text>
+         style="stroke-width:0.33261424px">Suite version 5.8.6</tspan></text>
   </g>
 </svg>
diff -Nru msxpertsuite-5.8.5/massxpert/org.msxpertsuite.massxpert.appdata.xml msxpertsuite-5.8.6/massxpert/org.msxpertsuite.massxpert.appdata.xml
--- msxpertsuite-5.8.5/massxpert/org.msxpertsuite.massxpert.appdata.xml	2019-02-12 08:44:07.000000000 +0000
+++ msxpertsuite-5.8.6/massxpert/org.msxpertsuite.massxpert.appdata.xml	2019-02-14 16:55:24.000000000 +0000
@@ -2,8 +2,8 @@
 <!-- Copyright 2018 Filippo Rusconi <msxpertsuite@msxpertsuite.org> -->
 	<component type="desktop-application">
 		<id>org.msxpertsuite.massxpert</id>
-		<metadata_license>GPL-3+</metadata_license>
-		<project_license>GPL-3+</project_license>
+		<metadata_license>CC-BY-SA-3.0</metadata_license>
+		<project_license> GPL-3.0-or-later</project_license>
 		<name>Mass spectrometry software</name>
 		<summary>Model and simulate mass spec data</summary>
 
diff -Nru msxpertsuite-5.8.5/minexpert/org.msxpertsuite.minexpert.appdata.xml msxpertsuite-5.8.6/minexpert/org.msxpertsuite.minexpert.appdata.xml
--- msxpertsuite-5.8.5/minexpert/org.msxpertsuite.minexpert.appdata.xml	2019-02-12 08:44:07.000000000 +0000
+++ msxpertsuite-5.8.6/minexpert/org.msxpertsuite.minexpert.appdata.xml	2019-02-14 16:55:24.000000000 +0000
@@ -2,8 +2,8 @@
 <!-- Copyright 2018 Filippo Rusconi <msxpertsuite@msxpertsuite.org> -->
 	<component type="desktop-application">
 		<id>org.msxpertsuite.massxpert</id>
-		<metadata_license>GPL-3+</metadata_license>
-		<project_license>GPL-3+</project_license>
+		<metadata_license>CC-BY-SA-3.0</metadata_license>
+		<project_license> GPL-3.0-or-later</project_license>
 		<name>Mass spectrometry software</name>
 		<summary>Visualize and mine mass spec data</summary>
 
@@ -28,6 +28,10 @@
 
 				<li>Navigation through the data is intuitive, flexible yet powerful;</li>
 
+				<li>Isotopic cluster calculations that can be configured to the finest detail.</li>
+
+				<li>The vast majority of the features of mineXpert can be driven by JavaScript'ing.</li>
+
 			</ul>
 
 		</description>
@@ -42,7 +46,7 @@
 			</screenshot>
 
 			<screenshot>
-				<caption>Color map show ion mobility mass data</caption>
+				<caption>Color map shows ion mobility mass data</caption>
 				<image>http://msxpertsuite.org/screenshots/minexpert/minexpert-colormap-wnd-shows-full-tool-bar.png</image>
 			</screenshot>
 
diff -Nru msxpertsuite-5.8.5/winInstaller/msxpertsuite-mingw64-win7+.iss msxpertsuite-5.8.6/winInstaller/msxpertsuite-mingw64-win7+.iss
--- msxpertsuite-5.8.5/winInstaller/msxpertsuite-mingw64-win7+.iss	2019-02-12 08:44:07.000000000 +0000
+++ msxpertsuite-5.8.6/winInstaller/msxpertsuite-mingw64-win7+.iss	2019-02-14 16:55:24.000000000 +0000
@@ -2,7 +2,7 @@
 AppName=msXpertSuite
 
 ; Set version number below
-#define public version "5.8.5"
+#define public version "5.8.6"
 AppVersion={#version}
 
 #define public arch "mingw64"