diff --git a/metadata/ais-vd-1.8.5-android-arm64-A64-16.xml b/metadata/ais-vd-1.8.5-android-arm64-A64-16.xml
deleted file mode 100644
index afa23cb2f7..0000000000
--- a/metadata/ais-vd-1.8.5-android-arm64-A64-16.xml
+++ /dev/null
@@ -1,27 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- https://circleci.com/gh/Hakansv/ais-vd_pi/1039 -->
-<plugin version="1">
-  <name> ais-vd </name>
-  <version> 1.8.5 </version>
-  <release> 0 </release>
-  <summary> Update AIS class A voyage data </summary>
-
-  <api-version> 1.18 </api-version>
-  <open-source> yes </open-source>
-  <author> Dirk R and Hakan S </author>
-  <source> https://github.com/Hakansv/ais-vd_pi </source>
-  <info-url> https://opencpn-manuals.github.io/main/ais-vd/0.1/index.html </info-url>
-
-  <description> Update AIS class A voyage static data as:
-Navigational status
-Destination, Time/Date of arrival,
-effective draught and persons on board
-using NMEA0183 ECVSD sentence.
- </description>
-
-  <target>android-arm64</target>
-  <target-version>16</target-version>
-  <target-arch>arm64</target-arch>
-  <tarball-url> https://dl.cloudsmith.io/public/opencpn/ais-vd-prod/raw/names/ais-vd-1.8.5-android-arm64-A64-16-tarball/versions/1.8.5/ais-vd-1.8.5_android-arm64-16-arm64.tar.gz </tarball-url>
-  <tarball-checksum> 54229342919eb4d521c2c5dac8ee7b99962ec537f4d0536ed029a1d319f83cff </tarball-checksum>
-</plugin>
diff --git a/metadata/ais-vd-1.8.5-android-armhf-A32-16.xml b/metadata/ais-vd-1.8.5-android-armhf-A32-16.xml
deleted file mode 100644
index ef93952ec9..0000000000
--- a/metadata/ais-vd-1.8.5-android-armhf-A32-16.xml
+++ /dev/null
@@ -1,27 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- https://circleci.com/gh/Hakansv/ais-vd_pi/1030 -->
-<plugin version="1">
-  <name> ais-vd </name>
-  <version> 1.8.5 </version>
-  <release> 0 </release>
-  <summary> Update AIS class A voyage data </summary>
-
-  <api-version> 1.18 </api-version>
-  <open-source> yes </open-source>
-  <author> Dirk R and Hakan S </author>
-  <source> https://github.com/Hakansv/ais-vd_pi </source>
-  <info-url> https://opencpn-manuals.github.io/main/ais-vd/0.1/index.html </info-url>
-
-  <description> Update AIS class A voyage static data as:
-Navigational status
-Destination, Time/Date of arrival,
-effective draught and persons on board
-using NMEA0183 ECVSD sentence.
- </description>
-
-  <target>android-armhf</target>
-  <target-version>16</target-version>
-  <target-arch>armhf</target-arch>
-  <tarball-url> https://dl.cloudsmith.io/public/opencpn/ais-vd-prod/raw/names/ais-vd-1.8.5-android-armhf-A32-16-tarball/versions/1.8.5/ais-vd-1.8.5_android-armhf-16-armhf.tar.gz </tarball-url>
-  <tarball-checksum> 62c9b653eeb7af45612fd18ef97324c82ff2461dcdd79db57c2decfd97b1cee0 </tarball-checksum>
-</plugin>
diff --git a/metadata/ais-vd-1.8.5-darwin-wx32-10.xml b/metadata/ais-vd-1.8.7-darwin-wx32-10.xml
similarity index 71%
rename from metadata/ais-vd-1.8.5-darwin-wx32-10.xml
rename to metadata/ais-vd-1.8.7-darwin-wx32-10.xml
index bc5c377e48..a70f1d7972 100644
--- a/metadata/ais-vd-1.8.5-darwin-wx32-10.xml
+++ b/metadata/ais-vd-1.8.7-darwin-wx32-10.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- https://circleci.com/gh/Hakansv/ais-vd_pi/1044 -->
+<!-- https://circleci.com/gh/Hakansv/ais-vd_pi/1101 -->
 <plugin version="1">
   <name> ais-vd </name>
-  <version> 1.8.5 </version>
+  <version> 1.8.7 </version>
   <release> 0 </release>
   <summary> Update AIS class A voyage data </summary>
 
@@ -22,6 +22,6 @@ using NMEA0183 ECVSD sentence.
   <target>darwin-wx32</target>
   <target-version>10</target-version>
   <target-arch>x86_64</target-arch>
-  <tarball-url> https://dl.cloudsmith.io/public/opencpn/ais-vd-prod/raw/names/ais-vd-1.8.5-darwin-wx32-10-tarball/versions/1.8.5/ais-vd-1.8.5_darwin-wx32-10-x86_64.tar.gz </tarball-url>
-  <tarball-checksum> 849497a810cd09c17f7155fe2e9b51303679a42b5d67eae37e59e7cfb27587bf </tarball-checksum>
+  <tarball-url> https://dl.cloudsmith.io/public/opencpn/ais-vd-prod/raw/names/ais-vd-1.8.7-darwin-wx32-10-tarball/versions/1.8.7/ais-vd-1.8.7_darwin-wx32-10-x86_64.tar.gz </tarball-url>
+  <tarball-checksum> 3ee5a818a50af8b43e81d24d79f51437a21744ab39b0e7b97c0b4065499dc6fa </tarball-checksum>
 </plugin>
diff --git a/metadata/ais-vd-1.8.5-darwin-wx32-universal-10.xml b/metadata/ais-vd-1.8.7-darwin-wx32-universal-10.xml
similarity index 71%
rename from metadata/ais-vd-1.8.5-darwin-wx32-universal-10.xml
rename to metadata/ais-vd-1.8.7-darwin-wx32-universal-10.xml
index 44ab3b8fe8..c011eb8c44 100644
--- a/metadata/ais-vd-1.8.5-darwin-wx32-universal-10.xml
+++ b/metadata/ais-vd-1.8.7-darwin-wx32-universal-10.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- https://circleci.com/gh/Hakansv/ais-vd_pi/1031 -->
+<!-- https://circleci.com/gh/Hakansv/ais-vd_pi/1112 -->
 <plugin version="1">
   <name> ais-vd </name>
-  <version> 1.8.5 </version>
+  <version> 1.8.7 </version>
   <release> 0 </release>
   <summary> Update AIS class A voyage data </summary>
 
@@ -22,6 +22,6 @@ using NMEA0183 ECVSD sentence.
   <target>darwin-wx32</target>
   <target-version>10</target-version>
   <target-arch>arm64;x86_64</target-arch>
-  <tarball-url> https://dl.cloudsmith.io/public/opencpn/ais-vd-prod/raw/names/ais-vd-1.8.5-darwin-wx32-universal-10-tarball/versions/1.8.5/ais-vd-1.8.5_darwin-wx32-10-arm64-x86_64.tar.gz </tarball-url>
-  <tarball-checksum> 1b4bf98d5943e447b8fad5f0ad526588abf811d4eba377c115bf4958eaf906fb </tarball-checksum>
+  <tarball-url> https://dl.cloudsmith.io/public/opencpn/ais-vd-prod/raw/names/ais-vd-1.8.7-darwin-wx32-universal-10-tarball/versions/1.8.7/ais-vd-1.8.7_darwin-wx32-10-arm64-x86_64.tar.gz </tarball-url>
+  <tarball-checksum> 89d87392f6a58fc4448b52b2e4a1b3a81a589fe712b50296f2a0597e0c528bf8 </tarball-checksum>
 </plugin>
diff --git a/metadata/ais-vd-1.8.5-debian-arm64-A64-12.xml b/metadata/ais-vd-1.8.7-debian-arm64-A64-12.xml
similarity index 75%
rename from metadata/ais-vd-1.8.5-debian-arm64-A64-12.xml
rename to metadata/ais-vd-1.8.7-debian-arm64-A64-12.xml
index 081573fbdd..ed3be140ed 100644
--- a/metadata/ais-vd-1.8.5-debian-arm64-A64-12.xml
+++ b/metadata/ais-vd-1.8.7-debian-arm64-A64-12.xml
@@ -2,7 +2,7 @@
 <!--  -->
 <plugin version="1">
   <name> ais-vd </name>
-  <version> 1.8.5 </version>
+  <version> 1.8.7 </version>
   <release> 0 </release>
   <summary> Update AIS class A voyage data </summary>
 
@@ -22,6 +22,6 @@ using NMEA0183 ECVSD sentence.
   <target>debian-arm64</target>
   <target-version>12</target-version>
   <target-arch>arm64</target-arch>
-  <tarball-url> https://dl.cloudsmith.io/public/opencpn/ais-vd-prod/raw/names/ais-vd-1.8.5-debian-arm64-A64-12-tarball/versions/1.8.5/ais-vd-1.8.5_debian-arm64-12-arm64.tar.gz </tarball-url>
-  <tarball-checksum> ce09c12ace6c2da452120461cb4d4dcc23464a2c446660d8855ee9e322e4bbd5 </tarball-checksum>
+  <tarball-url> https://dl.cloudsmith.io/public/opencpn/ais-vd-prod/raw/names/ais-vd-1.8.7-debian-arm64-A64-12-tarball/versions/1.8.7/ais-vd-1.8.7_debian-arm64-12-arm64.tar.gz </tarball-url>
+  <tarball-checksum> 799f7a2c03d24040f363a2c40ffbd6de8b5f1759a497b59ebb5c5296b4c637a5 </tarball-checksum>
 </plugin>
diff --git a/metadata/ais-vd-1.8.5-debian-arm64-A64-13.xml b/metadata/ais-vd-1.8.7-debian-arm64-A64-13.xml
similarity index 75%
rename from metadata/ais-vd-1.8.5-debian-arm64-A64-13.xml
rename to metadata/ais-vd-1.8.7-debian-arm64-A64-13.xml
index b6715fb464..8faa4071da 100644
--- a/metadata/ais-vd-1.8.5-debian-arm64-A64-13.xml
+++ b/metadata/ais-vd-1.8.7-debian-arm64-A64-13.xml
@@ -2,7 +2,7 @@
 <!--  -->
 <plugin version="1">
   <name> ais-vd </name>
-  <version> 1.8.5 </version>
+  <version> 1.8.7 </version>
   <release> 0 </release>
   <summary> Update AIS class A voyage data </summary>
 
@@ -22,6 +22,6 @@ using NMEA0183 ECVSD sentence.
   <target>debian-arm64</target>
   <target-version>13</target-version>
   <target-arch>arm64</target-arch>
-  <tarball-url> https://dl.cloudsmith.io/public/opencpn/ais-vd-prod/raw/names/ais-vd-1.8.5-debian-arm64-A64-13-tarball/versions/1.8.5/ais-vd-1.8.5_debian-arm64-13-arm64.tar.gz </tarball-url>
-  <tarball-checksum> c794bf405d5d648ab7f09bdb615d974688c6518c63555670c8e5198a860328b1 </tarball-checksum>
+  <tarball-url> https://dl.cloudsmith.io/public/opencpn/ais-vd-prod/raw/names/ais-vd-1.8.7-debian-arm64-A64-13-tarball/versions/1.8.7/ais-vd-1.8.7_debian-arm64-13-arm64.tar.gz </tarball-url>
+  <tarball-checksum> 5044dd532a02e7396e95aedd8c32007811d033c44de4eb322c581c5d0a2d29d5 </tarball-checksum>
 </plugin>
diff --git a/metadata/ais-vd-1.8.5-debian-armhf-A32-12.xml b/metadata/ais-vd-1.8.7-debian-armhf-A32-12.xml
similarity index 75%
rename from metadata/ais-vd-1.8.5-debian-armhf-A32-12.xml
rename to metadata/ais-vd-1.8.7-debian-armhf-A32-12.xml
index a5cf6bcd23..0e19f1f2b2 100644
--- a/metadata/ais-vd-1.8.5-debian-armhf-A32-12.xml
+++ b/metadata/ais-vd-1.8.7-debian-armhf-A32-12.xml
@@ -2,7 +2,7 @@
 <!--  -->
 <plugin version="1">
   <name> ais-vd </name>
-  <version> 1.8.5 </version>
+  <version> 1.8.7 </version>
   <release> 0 </release>
   <summary> Update AIS class A voyage data </summary>
 
@@ -22,6 +22,6 @@ using NMEA0183 ECVSD sentence.
   <target>debian-armhf</target>
   <target-version>12</target-version>
   <target-arch>armhf</target-arch>
-  <tarball-url> https://dl.cloudsmith.io/public/opencpn/ais-vd-prod/raw/names/ais-vd-1.8.5-debian-armhf-A32-12-tarball/versions/1.8.5/ais-vd-1.8.5_debian-armhf-12-armhf.tar.gz </tarball-url>
-  <tarball-checksum> 172279b6e23772308f49dcf7b6a534149741f4eac2a5f24bd75db361d26f0a78 </tarball-checksum>
+  <tarball-url> https://dl.cloudsmith.io/public/opencpn/ais-vd-prod/raw/names/ais-vd-1.8.7-debian-armhf-A32-12-tarball/versions/1.8.7/ais-vd-1.8.7_debian-armhf-12-armhf.tar.gz </tarball-url>
+  <tarball-checksum> dd07e5c32a465d7052acdc6380ed860610a57501fcbc35a496528dc5bdf29a2c </tarball-checksum>
 </plugin>
diff --git a/metadata/ais-vd-1.8.5-debian-armhf-A32-13.xml b/metadata/ais-vd-1.8.7-debian-armhf-A32-13.xml
similarity index 75%
rename from metadata/ais-vd-1.8.5-debian-armhf-A32-13.xml
rename to metadata/ais-vd-1.8.7-debian-armhf-A32-13.xml
index 5e353e318c..b9e5804500 100644
--- a/metadata/ais-vd-1.8.5-debian-armhf-A32-13.xml
+++ b/metadata/ais-vd-1.8.7-debian-armhf-A32-13.xml
@@ -2,7 +2,7 @@
 <!--  -->
 <plugin version="1">
   <name> ais-vd </name>
-  <version> 1.8.5 </version>
+  <version> 1.8.7 </version>
   <release> 0 </release>
   <summary> Update AIS class A voyage data </summary>
 
@@ -22,6 +22,6 @@ using NMEA0183 ECVSD sentence.
   <target>debian-armhf</target>
   <target-version>13</target-version>
   <target-arch>armhf</target-arch>
-  <tarball-url> https://dl.cloudsmith.io/public/opencpn/ais-vd-prod/raw/names/ais-vd-1.8.5-debian-armhf-A32-13-tarball/versions/1.8.5/ais-vd-1.8.5_debian-armhf-13-armhf.tar.gz </tarball-url>
-  <tarball-checksum> a40d8c744bc6bf6113e5114faa3cc0de64cd0bcc04dc30c458304542993d846c </tarball-checksum>
+  <tarball-url> https://dl.cloudsmith.io/public/opencpn/ais-vd-prod/raw/names/ais-vd-1.8.7-debian-armhf-A32-13-tarball/versions/1.8.7/ais-vd-1.8.7_debian-armhf-13-armhf.tar.gz </tarball-url>
+  <tarball-checksum> b2518f5fc08298345bbac3c8b72b70869919abbd429789aef3508a3368f2139a </tarball-checksum>
 </plugin>
diff --git a/metadata/ais-vd-1.8.5-debian-wx32-x86_64-11.xml b/metadata/ais-vd-1.8.7-debian-wx32-x86_64-11.xml
similarity index 71%
rename from metadata/ais-vd-1.8.5-debian-wx32-x86_64-11.xml
rename to metadata/ais-vd-1.8.7-debian-wx32-x86_64-11.xml
index 25e7048c2c..dd4bbf6c84 100644
--- a/metadata/ais-vd-1.8.5-debian-wx32-x86_64-11.xml
+++ b/metadata/ais-vd-1.8.7-debian-wx32-x86_64-11.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- https://circleci.com/gh/Hakansv/ais-vd_pi/1045 -->
+<!-- https://circleci.com/gh/Hakansv/ais-vd_pi/1110 -->
 <plugin version="1">
   <name> ais-vd </name>
-  <version> 1.8.5 </version>
+  <version> 1.8.7 </version>
   <release> 0 </release>
   <summary> Update AIS class A voyage data </summary>
 
@@ -22,6 +22,6 @@ using NMEA0183 ECVSD sentence.
   <target>debian-wx32-x86_64</target>
   <target-version>11</target-version>
   <target-arch>x86_64</target-arch>
-  <tarball-url> https://dl.cloudsmith.io/public/opencpn/ais-vd-prod/raw/names/ais-vd-1.8.5-debian-wx32-x86_64-11-tarball/versions/1.8.5/ais-vd-1.8.5_debian-wx32-x86_64-11-x86_64.tar.gz </tarball-url>
-  <tarball-checksum> d33965760cdc8fb82ae36ae1e2db9a5e966dad756d3e2e3c070df36f13bca708 </tarball-checksum>
+  <tarball-url> https://dl.cloudsmith.io/public/opencpn/ais-vd-prod/raw/names/ais-vd-1.8.7-debian-wx32-x86_64-11-tarball/versions/1.8.7/ais-vd-1.8.7_debian-wx32-x86_64-11-x86_64.tar.gz </tarball-url>
+  <tarball-checksum> 89af3540df8933f863d2d285507d0859a1d7c085f5f44a444b29342d633d811d </tarball-checksum>
 </plugin>
diff --git a/metadata/ais-vd-1.8.5-debian-x86_64-11.xml b/metadata/ais-vd-1.8.7-debian-x86_64-11.xml
similarity index 71%
rename from metadata/ais-vd-1.8.5-debian-x86_64-11.xml
rename to metadata/ais-vd-1.8.7-debian-x86_64-11.xml
index ac9ef97b18..ef74acf551 100644
--- a/metadata/ais-vd-1.8.5-debian-x86_64-11.xml
+++ b/metadata/ais-vd-1.8.7-debian-x86_64-11.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- https://circleci.com/gh/Hakansv/ais-vd_pi/1032 -->
+<!-- https://circleci.com/gh/Hakansv/ais-vd_pi/1098 -->
 <plugin version="1">
   <name> ais-vd </name>
-  <version> 1.8.5 </version>
+  <version> 1.8.7 </version>
   <release> 0 </release>
   <summary> Update AIS class A voyage data </summary>
 
@@ -22,6 +22,6 @@ using NMEA0183 ECVSD sentence.
   <target>debian-x86_64</target>
   <target-version>11</target-version>
   <target-arch>x86_64</target-arch>
-  <tarball-url> https://dl.cloudsmith.io/public/opencpn/ais-vd-prod/raw/names/ais-vd-1.8.5-debian-x86_64-11-tarball/versions/1.8.5/ais-vd-1.8.5_debian-x86_64-11-x86_64.tar.gz </tarball-url>
-  <tarball-checksum> 717d48d2988527658d8c2dc22a756a132ad00ee7c44077d517121135e275c199 </tarball-checksum>
+  <tarball-url> https://dl.cloudsmith.io/public/opencpn/ais-vd-prod/raw/names/ais-vd-1.8.7-debian-x86_64-11-tarball/versions/1.8.7/ais-vd-1.8.7_debian-x86_64-11-x86_64.tar.gz </tarball-url>
+  <tarball-checksum> 471fcad725ad83d2b763b065e5a5fc6af7e9eefd95d8e4352b75e60cdfc709fc </tarball-checksum>
 </plugin>
diff --git a/metadata/ais-vd-1.8.5-debian-x86_64-12.xml b/metadata/ais-vd-1.8.7-debian-x86_64-12.xml
similarity index 75%
rename from metadata/ais-vd-1.8.5-debian-x86_64-12.xml
rename to metadata/ais-vd-1.8.7-debian-x86_64-12.xml
index d06736804a..71a6699579 100644
--- a/metadata/ais-vd-1.8.5-debian-x86_64-12.xml
+++ b/metadata/ais-vd-1.8.7-debian-x86_64-12.xml
@@ -2,7 +2,7 @@
 <!--  -->
 <plugin version="1">
   <name> ais-vd </name>
-  <version> 1.8.5 </version>
+  <version> 1.8.7 </version>
   <release> 0 </release>
   <summary> Update AIS class A voyage data </summary>
 
@@ -22,6 +22,6 @@ using NMEA0183 ECVSD sentence.
   <target>debian-x86_64</target>
   <target-version>12</target-version>
   <target-arch>x86_64</target-arch>
-  <tarball-url> https://dl.cloudsmith.io/public/opencpn/ais-vd-prod/raw/names/ais-vd-1.8.5-debian-x86_64-12-tarball/versions/1.8.5/ais-vd-1.8.5_debian-x86_64-12-x86_64.tar.gz </tarball-url>
-  <tarball-checksum> 2b0f278eaa5355b0126a71e278ff23c2ee416877e70df7c6d7411bb6cef49c3b </tarball-checksum>
+  <tarball-url> https://dl.cloudsmith.io/public/opencpn/ais-vd-prod/raw/names/ais-vd-1.8.7-debian-x86_64-12-tarball/versions/1.8.7/ais-vd-1.8.7_debian-x86_64-12-x86_64.tar.gz </tarball-url>
+  <tarball-checksum> 2bced5578d7769ec4fb61cd574b887a78f51550d587a9c75e4bdbe8c677493c8 </tarball-checksum>
 </plugin>
diff --git a/metadata/ais-vd-1.8.5-debian-x86_64-13.xml b/metadata/ais-vd-1.8.7-debian-x86_64-13.xml
similarity index 75%
rename from metadata/ais-vd-1.8.5-debian-x86_64-13.xml
rename to metadata/ais-vd-1.8.7-debian-x86_64-13.xml
index d8dc96165a..5c706825da 100644
--- a/metadata/ais-vd-1.8.5-debian-x86_64-13.xml
+++ b/metadata/ais-vd-1.8.7-debian-x86_64-13.xml
@@ -2,7 +2,7 @@
 <!--  -->
 <plugin version="1">
   <name> ais-vd </name>
-  <version> 1.8.5 </version>
+  <version> 1.8.7 </version>
   <release> 0 </release>
   <summary> Update AIS class A voyage data </summary>
 
@@ -22,6 +22,6 @@ using NMEA0183 ECVSD sentence.
   <target>debian-x86_64</target>
   <target-version>13</target-version>
   <target-arch>x86_64</target-arch>
-  <tarball-url> https://dl.cloudsmith.io/public/opencpn/ais-vd-prod/raw/names/ais-vd-1.8.5-debian-x86_64-13-tarball/versions/1.8.5/ais-vd-1.8.5_debian-x86_64-13-x86_64.tar.gz </tarball-url>
-  <tarball-checksum> 7754a5fca141a71a289e29df8a1920b6f707f4060955345ac1c5bd915e5fd99a </tarball-checksum>
+  <tarball-url> https://dl.cloudsmith.io/public/opencpn/ais-vd-prod/raw/names/ais-vd-1.8.7-debian-x86_64-13-tarball/versions/1.8.7/ais-vd-1.8.7_debian-x86_64-13-x86_64.tar.gz </tarball-url>
+  <tarball-checksum> 1893572f431a77118e85de4f174d3ffd22f2fba190e362f3ff223c05fb40bd8c </tarball-checksum>
 </plugin>
diff --git a/metadata/ais-vd-1.8.5-flatpak-aarch64-A64-22.08.xml b/metadata/ais-vd-1.8.7-flatpak-aarch64-A64-22.08.xml
similarity index 71%
rename from metadata/ais-vd-1.8.5-flatpak-aarch64-A64-22.08.xml
rename to metadata/ais-vd-1.8.7-flatpak-aarch64-A64-22.08.xml
index e9ca6158f7..9145a82e7e 100644
--- a/metadata/ais-vd-1.8.5-flatpak-aarch64-A64-22.08.xml
+++ b/metadata/ais-vd-1.8.7-flatpak-aarch64-A64-22.08.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- https://circleci.com/gh/Hakansv/ais-vd_pi/1042 -->
+<!-- https://circleci.com/gh/Hakansv/ais-vd_pi/1109 -->
 <plugin version="1">
   <name> ais-vd </name>
-  <version> 1.8.5 </version>
+  <version> 1.8.7 </version>
   <release> 0 </release>
   <summary> Update AIS class A voyage data </summary>
 
@@ -22,6 +22,6 @@ using NMEA0183 ECVSD sentence.
   <target>flatpak-aarch64</target>
   <target-version>22.08</target-version>
   <target-arch>aarch64</target-arch>
-  <tarball-url> https://dl.cloudsmith.io/public/opencpn/ais-vd-prod/raw/names/ais-vd-1.8.5-flatpak-aarch64-A64-22.08-tarball/versions/1.8.5/ais-vd-1.8.5_flatpak-aarch64-22.08-aarch64.tar.gz </tarball-url>
-  <tarball-checksum> f12bf32a5f8f31ecd5c2eb4b0466f40052e56a9fd1a40c53ac92e85095815df0 </tarball-checksum>
+  <tarball-url> https://dl.cloudsmith.io/public/opencpn/ais-vd-prod/raw/names/ais-vd-1.8.7-flatpak-aarch64-A64-22.08-tarball/versions/1.8.7/ais-vd-1.8.7_flatpak-aarch64-22.08-aarch64.tar.gz </tarball-url>
+  <tarball-checksum> 14057174400ca09cbbc7387d2ffc6f88e3546953e1a16f1dcfdd3e919707c5d2 </tarball-checksum>
 </plugin>
diff --git a/metadata/ais-vd-1.8.5-flatpak-aarch64-A64-24.08.xml b/metadata/ais-vd-1.8.7-flatpak-aarch64-A64-24.08.xml
similarity index 71%
rename from metadata/ais-vd-1.8.5-flatpak-aarch64-A64-24.08.xml
rename to metadata/ais-vd-1.8.7-flatpak-aarch64-A64-24.08.xml
index a656dbd247..d66aa07be4 100644
--- a/metadata/ais-vd-1.8.5-flatpak-aarch64-A64-24.08.xml
+++ b/metadata/ais-vd-1.8.7-flatpak-aarch64-A64-24.08.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- https://circleci.com/gh/Hakansv/ais-vd_pi/1041 -->
+<!-- https://circleci.com/gh/Hakansv/ais-vd_pi/1100 -->
 <plugin version="1">
   <name> ais-vd </name>
-  <version> 1.8.5 </version>
+  <version> 1.8.7 </version>
   <release> 0 </release>
   <summary> Update AIS class A voyage data </summary>
 
@@ -22,6 +22,6 @@ using NMEA0183 ECVSD sentence.
   <target>flatpak-aarch64</target>
   <target-version>24.08</target-version>
   <target-arch>aarch64</target-arch>
-  <tarball-url> https://dl.cloudsmith.io/public/opencpn/ais-vd-prod/raw/names/ais-vd-1.8.5-flatpak-aarch64-A64-24.08-tarball/versions/1.8.5/ais-vd-1.8.5_flatpak-aarch64-24.08-aarch64.tar.gz </tarball-url>
-  <tarball-checksum> 35e8ac3017a36ac8bc4102fcb6a395add7beb580cd064d8c2dde6ba9ebe811f9 </tarball-checksum>
+  <tarball-url> https://dl.cloudsmith.io/public/opencpn/ais-vd-prod/raw/names/ais-vd-1.8.7-flatpak-aarch64-A64-24.08-tarball/versions/1.8.7/ais-vd-1.8.7_flatpak-aarch64-24.08-aarch64.tar.gz </tarball-url>
+  <tarball-checksum> c4d2193567e1ff69af9281dc756f969dd3587e7d95e1a675beb78dfa438a4253 </tarball-checksum>
 </plugin>
diff --git a/metadata/ais-vd-1.8.5-flatpak-aarch64-A64-25.08.xml b/metadata/ais-vd-1.8.7-flatpak-aarch64-A64-25.08.xml
similarity index 71%
rename from metadata/ais-vd-1.8.5-flatpak-aarch64-A64-25.08.xml
rename to metadata/ais-vd-1.8.7-flatpak-aarch64-A64-25.08.xml
index 7572481bc4..3f90d966fb 100644
--- a/metadata/ais-vd-1.8.5-flatpak-aarch64-A64-25.08.xml
+++ b/metadata/ais-vd-1.8.7-flatpak-aarch64-A64-25.08.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- https://circleci.com/gh/Hakansv/ais-vd_pi/1033 -->
+<!-- https://circleci.com/gh/Hakansv/ais-vd_pi/1106 -->
 <plugin version="1">
   <name> ais-vd </name>
-  <version> 1.8.5 </version>
+  <version> 1.8.7 </version>
   <release> 0 </release>
   <summary> Update AIS class A voyage data </summary>
 
@@ -22,6 +22,6 @@ using NMEA0183 ECVSD sentence.
   <target>flatpak-aarch64</target>
   <target-version>25.08</target-version>
   <target-arch>aarch64</target-arch>
-  <tarball-url> https://dl.cloudsmith.io/public/opencpn/ais-vd-prod/raw/names/ais-vd-1.8.5-flatpak-aarch64-A64-25.08-tarball/versions/1.8.5/ais-vd-1.8.5_flatpak-aarch64-25.08-aarch64.tar.gz </tarball-url>
-  <tarball-checksum> 08aa47573443598cfa7aeab717cf0f6da7367f0c34d4517960d7656dd3faffe5 </tarball-checksum>
+  <tarball-url> https://dl.cloudsmith.io/public/opencpn/ais-vd-prod/raw/names/ais-vd-1.8.7-flatpak-aarch64-A64-25.08-tarball/versions/1.8.7/ais-vd-1.8.7_flatpak-aarch64-25.08-aarch64.tar.gz </tarball-url>
+  <tarball-checksum> 8c2a715812d494dadd4417b8be0616b881372d5646c5811a603d1a65282b39b8 </tarball-checksum>
 </plugin>
diff --git a/metadata/ais-vd-1.8.5-flatpak-x86_64-22.08.xml b/metadata/ais-vd-1.8.7-flatpak-x86_64-22.08.xml
similarity index 71%
rename from metadata/ais-vd-1.8.5-flatpak-x86_64-22.08.xml
rename to metadata/ais-vd-1.8.7-flatpak-x86_64-22.08.xml
index 477bd8d3c0..c482775414 100644
--- a/metadata/ais-vd-1.8.5-flatpak-x86_64-22.08.xml
+++ b/metadata/ais-vd-1.8.7-flatpak-x86_64-22.08.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- https://circleci.com/gh/Hakansv/ais-vd_pi/1043 -->
+<!-- https://circleci.com/gh/Hakansv/ais-vd_pi/1104 -->
 <plugin version="1">
   <name> ais-vd </name>
-  <version> 1.8.5 </version>
+  <version> 1.8.7 </version>
   <release> 0 </release>
   <summary> Update AIS class A voyage data </summary>
 
@@ -22,6 +22,6 @@ using NMEA0183 ECVSD sentence.
   <target>flatpak-x86_64</target>
   <target-version>22.08</target-version>
   <target-arch>x86_64</target-arch>
-  <tarball-url> https://dl.cloudsmith.io/public/opencpn/ais-vd-prod/raw/names/ais-vd-1.8.5-flatpak-x86_64-22.08-tarball/versions/1.8.5/ais-vd-1.8.5_flatpak-x86_64-22.08-x86_64.tar.gz </tarball-url>
-  <tarball-checksum> 3343b807182a245a76e8630b2f44662bc2f5f3c4b4defe1b65978c70b427be78 </tarball-checksum>
+  <tarball-url> https://dl.cloudsmith.io/public/opencpn/ais-vd-prod/raw/names/ais-vd-1.8.7-flatpak-x86_64-22.08-tarball/versions/1.8.7/ais-vd-1.8.7_flatpak-x86_64-22.08-x86_64.tar.gz </tarball-url>
+  <tarball-checksum> 2850e93a6e9b5022e849c8769dd97f442706ce5a39d34145c0b54d35c13bf4be </tarball-checksum>
 </plugin>
diff --git a/metadata/ais-vd-1.8.5-flatpak-x86_64-24.08.xml b/metadata/ais-vd-1.8.7-flatpak-x86_64-24.08.xml
similarity index 71%
rename from metadata/ais-vd-1.8.5-flatpak-x86_64-24.08.xml
rename to metadata/ais-vd-1.8.7-flatpak-x86_64-24.08.xml
index 96e30d3136..837d314c6b 100644
--- a/metadata/ais-vd-1.8.5-flatpak-x86_64-24.08.xml
+++ b/metadata/ais-vd-1.8.7-flatpak-x86_64-24.08.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- https://circleci.com/gh/Hakansv/ais-vd_pi/1040 -->
+<!-- https://circleci.com/gh/Hakansv/ais-vd_pi/1105 -->
 <plugin version="1">
   <name> ais-vd </name>
-  <version> 1.8.5 </version>
+  <version> 1.8.7 </version>
   <release> 0 </release>
   <summary> Update AIS class A voyage data </summary>
 
@@ -22,6 +22,6 @@ using NMEA0183 ECVSD sentence.
   <target>flatpak-x86_64</target>
   <target-version>24.08</target-version>
   <target-arch>x86_64</target-arch>
-  <tarball-url> https://dl.cloudsmith.io/public/opencpn/ais-vd-prod/raw/names/ais-vd-1.8.5-flatpak-x86_64-24.08-tarball/versions/1.8.5/ais-vd-1.8.5_flatpak-x86_64-24.08-x86_64.tar.gz </tarball-url>
-  <tarball-checksum> 4d3fb3514659412215d725cd5821971e2f6b33bfcf170b0ec8f39f7b2419f738 </tarball-checksum>
+  <tarball-url> https://dl.cloudsmith.io/public/opencpn/ais-vd-prod/raw/names/ais-vd-1.8.7-flatpak-x86_64-24.08-tarball/versions/1.8.7/ais-vd-1.8.7_flatpak-x86_64-24.08-x86_64.tar.gz </tarball-url>
+  <tarball-checksum> c6e3af1923b68f5016d1b95b744e273900e50088de113b53390b9f080452655e </tarball-checksum>
 </plugin>
diff --git a/metadata/ais-vd-1.8.5-flatpak-x86_64-25.08.xml b/metadata/ais-vd-1.8.7-flatpak-x86_64-25.08.xml
similarity index 71%
rename from metadata/ais-vd-1.8.5-flatpak-x86_64-25.08.xml
rename to metadata/ais-vd-1.8.7-flatpak-x86_64-25.08.xml
index 372d496c80..255dedd266 100644
--- a/metadata/ais-vd-1.8.5-flatpak-x86_64-25.08.xml
+++ b/metadata/ais-vd-1.8.7-flatpak-x86_64-25.08.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- https://circleci.com/gh/Hakansv/ais-vd_pi/1028 -->
+<!-- https://circleci.com/gh/Hakansv/ais-vd_pi/1102 -->
 <plugin version="1">
   <name> ais-vd </name>
-  <version> 1.8.5 </version>
+  <version> 1.8.7 </version>
   <release> 0 </release>
   <summary> Update AIS class A voyage data </summary>
 
@@ -22,6 +22,6 @@ using NMEA0183 ECVSD sentence.
   <target>flatpak-x86_64</target>
   <target-version>25.08</target-version>
   <target-arch>x86_64</target-arch>
-  <tarball-url> https://dl.cloudsmith.io/public/opencpn/ais-vd-prod/raw/names/ais-vd-1.8.5-flatpak-x86_64-25.08-tarball/versions/1.8.5/ais-vd-1.8.5_flatpak-x86_64-25.08-x86_64.tar.gz </tarball-url>
-  <tarball-checksum> e81800475fd563af1cc1916a028ba49a5572148b2f16bf6428849995ebc6e246 </tarball-checksum>
+  <tarball-url> https://dl.cloudsmith.io/public/opencpn/ais-vd-prod/raw/names/ais-vd-1.8.7-flatpak-x86_64-25.08-tarball/versions/1.8.7/ais-vd-1.8.7_flatpak-x86_64-25.08-x86_64.tar.gz </tarball-url>
+  <tarball-checksum> 214aeec6a6a59c4f8741b08488869690e9b06997817a1b04edc5336e940c3c47 </tarball-checksum>
 </plugin>
diff --git a/metadata/ais-vd-1.8.5-msvc-wx32-10.xml b/metadata/ais-vd-1.8.7-msvc-wx32-10.xml
similarity index 70%
rename from metadata/ais-vd-1.8.5-msvc-wx32-10.xml
rename to metadata/ais-vd-1.8.7-msvc-wx32-10.xml
index d759a7b97a..75c7348789 100644
--- a/metadata/ais-vd-1.8.5-msvc-wx32-10.xml
+++ b/metadata/ais-vd-1.8.7-msvc-wx32-10.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- https://ci.appveyor.com/project/Hakansv/ais-vd-pi/builds/53813137 -->
+<!-- https://ci.appveyor.com/project/Hakansv/ais-vd-pi/builds/54188715 -->
 <plugin version="1">
   <name> ais-vd </name>
-  <version> 1.8.5 </version>
+  <version> 1.8.7 </version>
   <release> 0 </release>
   <summary> Update AIS class A voyage data </summary>
 
@@ -22,6 +22,6 @@ using NMEA0183 ECVSD sentence.
   <target>msvc-wx32</target>
   <target-version>10</target-version>
   <target-arch>x86</target-arch>
-  <tarball-url> https://dl.cloudsmith.io/public/opencpn/ais-vd-prod/raw/names/ais-vd-1.8.5-msvc-wx32-10-tarball/versions/1.8.5/ais-vd-1.8.5_msvc-wx32-10-x86.tar.gz </tarball-url>
-  <tarball-checksum> c79cddb71d18c8d8f2ae205b6f074908f947f3498adda1622dfe2efc7d675c51 </tarball-checksum>
+  <tarball-url> https://dl.cloudsmith.io/public/opencpn/ais-vd-prod/raw/names/ais-vd-1.8.7-msvc-wx32-10-tarball/versions/1.8.7/ais-vd-1.8.7_msvc-wx32-10-x86.tar.gz </tarball-url>
+  <tarball-checksum> a3f3153771b64282bab6148da061ed8b8128f3e35acaa8cc653e627d33565d5c </tarball-checksum>
 </plugin>