diff --git a/office/ganttproject/biz.ganttproject.core.patch b/office/ganttproject/biz.ganttproject.core.patch
index f1c7219914..02a455c750 100644
--- a/office/ganttproject/biz.ganttproject.core.patch
+++ b/office/ganttproject/biz.ganttproject.core.patch
@@ -1,5 +1,5 @@
---- biz.ganttproject.core/plugin.xml	2017-03-06 17:21:28.000000000 +0300
-+++ plugin-new.xml	2017-03-10 00:56:58.687956019 +0300
+--- biz.ganttproject.core/plugin.xml	2017-05-19 17:44:40.000000000 +0300
++++ plugin-new.xml	2017-07-10 09:59:04.074721494 +0300
 @@ -6,7 +6,7 @@
     provider-name="">
  
diff --git a/office/ganttproject/biz.ganttproject.impex.ical.patch b/office/ganttproject/biz.ganttproject.impex.ical.patch
new file mode 100644
index 0000000000..547f0ac554
--- /dev/null
+++ b/office/ganttproject/biz.ganttproject.impex.ical.patch
@@ -0,0 +1,11 @@
+--- biz.ganttproject.impex.ical/plugin.xml	2017-05-19 17:44:40.000000000 +0300
++++ plugin-new.xml	2017-07-10 10:02:54.303708759 +0300
+@@ -6,7 +6,7 @@
+    provider-name="">
+ 
+    <runtime>
+-      <library name="biz.ganttproject.impex.ical.jar">
++      <library name="ganttproject-ical.jar">
+          <export name="*"/>
+       </library>
+       <library name="lib/backport-util-concurrent-3.1.jar">
diff --git a/office/ganttproject/biz.ganttproject.impex.msproject2.patch b/office/ganttproject/biz.ganttproject.impex.msproject2.patch
index 8a1c5956bf..6503310186 100644
--- a/office/ganttproject/biz.ganttproject.impex.msproject2.patch
+++ b/office/ganttproject/biz.ganttproject.impex.msproject2.patch
@@ -1,5 +1,5 @@
---- biz.ganttproject.impex.msproject2/plugin.xml	2017-03-06 17:21:28.000000000 +0300
-+++ plugin-new.xml	2017-03-10 00:58:56.703949491 +0300
+--- biz.ganttproject.impex.msproject2/plugin.xml	2017-07-10 09:26:53.002828307 +0300
++++ plugin-new.xml	2017-07-10 09:27:06.851827541 +0300
 @@ -7,7 +7,7 @@
     provider-name="">
  
diff --git a/office/ganttproject/ganttproject.SlackBuild b/office/ganttproject/ganttproject.SlackBuild
index 45bc85d579..ce2fde98ba 100644
--- a/office/ganttproject/ganttproject.SlackBuild
+++ b/office/ganttproject/ganttproject.SlackBuild
@@ -25,7 +25,7 @@
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=ganttproject
-VERSION=${VERSION:-2.8.4}
+VERSION=${VERSION:-2.8.5}
 ARCH=noarch
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
@@ -59,6 +59,7 @@ patch -p0 < $CWD/build.xml.patch
 
 # Fix wrong jar names in plugins XML files
 patch -p0 < $CWD/biz.ganttproject.core.patch
+patch -p0 < $CWD/biz.ganttproject.impex.ical.patch
 patch -p0 < $CWD/biz.ganttproject.impex.msproject2.patch
 patch -p0 < $CWD/org.ganttproject.chart.pert.patch
 patch -p0 < $CWD/org.ganttproject.impex.htmlpdf.patch
diff --git a/office/ganttproject/ganttproject.info b/office/ganttproject/ganttproject.info
index 2016100e97..bd2410eb25 100644
--- a/office/ganttproject/ganttproject.info
+++ b/office/ganttproject/ganttproject.info
@@ -1,8 +1,8 @@
 PRGNAM="ganttproject"
-VERSION="2.8.4"
+VERSION="2.8.5"
 HOMEPAGE="http://www.ganttproject.biz"
-DOWNLOAD="https://github.com/bardsoftware/ganttproject/archive/ganttproject-2.8.4/ganttproject-ganttproject-2.8.4.tar.gz"
-MD5SUM="8aa4670dbdcaeae8cb4e2e7e5a74b28c"
+DOWNLOAD="https://github.com/bardsoftware/ganttproject/archive/ganttproject-2.8.5/ganttproject-ganttproject-2.8.5.tar.gz"
+MD5SUM="1761fd1f97b17de4ff3e05e08e0b4ab7"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="apache-ant jdk"
diff --git a/office/ganttproject/org.ganttproject.chart.pert.patch b/office/ganttproject/org.ganttproject.chart.pert.patch
index 26a2ffc393..c5f4343d28 100644
--- a/office/ganttproject/org.ganttproject.chart.pert.patch
+++ b/office/ganttproject/org.ganttproject.chart.pert.patch
@@ -1,5 +1,5 @@
---- org.ganttproject.chart.pert/plugin.xml	2017-03-06 17:21:28.000000000 +0300
-+++ plugin-new.xml	2017-03-10 00:59:47.875946661 +0300
+--- org.ganttproject.chart.pert/plugin.xml	2017-05-19 17:44:40.000000000 +0300
++++ plugin-new.xml	2017-07-10 09:27:53.619824955 +0300
 @@ -7,7 +7,7 @@
     provider-name="">
  
diff --git a/office/ganttproject/org.ganttproject.impex.htmlpdf.patch b/office/ganttproject/org.ganttproject.impex.htmlpdf.patch
index f992617ff5..e8f2012ccc 100644
--- a/office/ganttproject/org.ganttproject.impex.htmlpdf.patch
+++ b/office/ganttproject/org.ganttproject.impex.htmlpdf.patch
@@ -1,5 +1,5 @@
---- org.ganttproject.impex.htmlpdf/plugin.xml	2017-03-06 17:21:28.000000000 +0300
-+++ plugin-new.xml	2017-03-10 01:02:20.842938200 +0300
+--- org.ganttproject.impex.htmlpdf/plugin.xml	2017-07-10 09:28:52.537821696 +0300
++++ plugin-new.xml	2017-07-10 09:29:07.032820894 +0300
 @@ -7,7 +7,7 @@
     provider-name="ganttproject.org team">