diff --git a/files/freeplane.desktop b/files/freeplane.desktop
deleted file mode 100644
--- a/files/freeplane.desktop
+++ /dev/null
@@ -1,11 +0,0 @@
-[Desktop Entry]
-Version=1.0
-Name=Freeplane
-Exec=/bin/sh /usr/share/freeplane/freeplane.sh %f
-Terminal=false
-Icon=/usr/share/freeplane/freeplane.svg
-Type=Application
-MimeType=application/x-freemind;
-Categories=Office;
-GenericName=Freeplane
-Comment=A free mind mapping tool
\ No newline at end of file
diff --git a/files/freeplane.sh b/files/freeplane.sh
new file mode 100644
--- /dev/null
+++ b/files/freeplane.sh
@@ -0,0 +1,3 @@
+#!/bin/sh
+
+JAVACMD=/usr/lib64/openjdk-8/bin/java exec /usr/share/freeplane/freeplane.sh
\ No newline at end of file
diff --git a/package.yml b/package.yml
--- a/package.yml
+++ b/package.yml
@@ -1,26 +1,42 @@
 name       : freeplane
 version    : 1.7.10
-release    : 8
+release    : 9
 source     :
-    - https://liquidtelecom.dl.sourceforge.net/project/freeplane/freeplane%20stable/freeplane_src-1.7.10.tar.gz : 6d594eb0c5b237fdf5ae2b37743d3aae09a93d7a07552a5d598362e37ed30ec5
+    - https://github.com/freeplane/freeplane/archive/release-1.7.10.tar.gz : cffe68cb342cb221effb885ae9ddaeb0feab50184b15552cb01f62a43b7f55dc
 homepage   : https://www.freeplane.org
 license    : GPL-2.0-or-later
 component  : office
 networking : yes
-summary    : An application for Mind Mapping, plus Knowledge and Project Management
+summary    : An application for mind mapping, plus knowledge and project management
 description: |
-    Freeplane is a free and open source software application that supports thinking, sharing information and getting things done at work, in school and at home. The software can be used for mind mapping and analyzing the information contained in mind maps. 
+    Freeplane is a free and open source software application that supports thinking, sharing information and getting things done at work, in school and at home. The software can be used for mind mapping and analyzing the information contained in mind maps.
 builddeps  :
+    - font-ubuntu-ttf   # Tests
+    - fontconfig        # Tests
     - gradle
 rundeps    :
+    - fontconfig
     - openjdk-8
+setup      : |
+    # Remove this on the next update.
+    sed 's|http://|https://|' -i build.gradle
+
+    rm -rf freeplane_mac
 build      : |
     export GRADLE_USER_HOME=~/
-    gradle --no-daemon build -x test
+    gradle build
 install    : |
-    install -d $installdir/usr/share/freeplane
-    cp -R BIN/* $installdir/usr/share/freeplane/
-    chmod -R 00644 $installdir/usr/share/freeplane
+    install -dm00755 $installdir/usr/share/freeplane
+    cp -a BIN/* $installdir/usr/share/freeplane
     chmod 00755 $installdir/usr/share/freeplane/freeplane.sh
-    install -D -m00644 $pkgfiles/freeplane.desktop $installdir/usr/share/applications/freeplane.desktop
 
+    install -dm00755 $installdir/usr/share/icons/hicolor/{scalable,32x32}/apps
+    ln -s /usr/share/freeplane/freeplane.svg $installdir/usr/share/icons/hicolor/scalable/apps/freeplane.svg
+    ln -s /usr/share/freeplane/freeplane.png $installdir/usr/share/icons/hicolor/32x32/apps/freeplane.png
+
+    install -Dm00644 $workdir/freeplane/src/editor/resources/linux/freeplane.desktop -t $installdir/usr/share/applications
+    install -Dm00644 $workdir/debian-meta-data/freeplane.sharedmimeinfo $installdir/usr/share/mime/packages/freeplane.xml
+
+    install -Dm00755 $pkgfiles/freeplane.sh $installdir/usr/bin/freeplane
+
+    rm $installdir/usr/share/freeplane/{*.bat,*.dll}
diff --git a/pspec_x86_64.xml b/pspec_x86_64.xml
--- a/pspec_x86_64.xml
+++ b/pspec_x86_64.xml
@@ -3,23 +3,24 @@
         <Name>freeplane</Name>
         <Homepage>https://www.freeplane.org</Homepage>
         <Packager>
-            <Name>Algent Albrahimi</Name>
-            <Email>algent@protonmail.com</Email>
+            <Name>Fabio Forni</Name>
+            <Email>livingsilver94.solus@redaril.me</Email>
         </Packager>
         <License>GPL-2.0-or-later</License>
         <PartOf>office</PartOf>
-        <Summary xml:lang="en">An application for Mind Mapping, plus Knowledge and Project Management</Summary>
-        <Description xml:lang="en">Freeplane is a free and open source software application that supports thinking, sharing information and getting things done at work, in school and at home. The software can be used for mind mapping and analyzing the information contained in mind maps. 
+        <Summary xml:lang="en">An application for mind mapping, plus knowledge and project management</Summary>
+        <Description xml:lang="en">Freeplane is a free and open source software application that supports thinking, sharing information and getting things done at work, in school and at home. The software can be used for mind mapping and analyzing the information contained in mind maps.
 </Description>
         <Archive type="binary" sha1sum="79eb0752a961b8e0d15c77d298c97498fbc89c5a">https://getsol.us/sources/README.Solus</Archive>
     </Source>
     <Package>
         <Name>freeplane</Name>
-        <Summary xml:lang="en">An application for Mind Mapping, plus Knowledge and Project Management</Summary>
-        <Description xml:lang="en">Freeplane is a free and open source software application that supports thinking, sharing information and getting things done at work, in school and at home. The software can be used for mind mapping and analyzing the information contained in mind maps. 
+        <Summary xml:lang="en">An application for mind mapping, plus knowledge and project management</Summary>
+        <Description xml:lang="en">Freeplane is a free and open source software application that supports thinking, sharing information and getting things done at work, in school and at home. The software can be used for mind mapping and analyzing the information contained in mind maps.
 </Description>
         <PartOf>office</PartOf>
         <Files>
+            <Path fileType="executable">/usr/bin/freeplane</Path>
             <Path fileType="data">/usr/share/applications/freeplane.desktop</Path>
             <Path fileType="data">/usr/share/freeplane/core/org.freeplane.core/META-INF/MANIFEST.MF</Path>
             <Path fileType="data">/usr/share/freeplane/core/org.freeplane.core/lib/SimplyHTML-0.17.3.jar</Path>
@@ -50,7 +51,6 @@
             <Path fileType="data">/usr/share/freeplane/doc/Images/doc/goto node with ID.png</Path>
             <Path fileType="data">/usr/share/freeplane/doc/Images/doc/key mapping dialog.png</Path>
             <Path fileType="data">/usr/share/freeplane/doc/Images/doc/mapView v outlineView.png</Path>
-            <Path fileType="data">/usr/share/freeplane/doc/Images/doc/photothumb.db</Path>
             <Path fileType="data">/usr/share/freeplane/doc/Images/doc/right-click menu - open maps.png</Path>
             <Path fileType="data">/usr/share/freeplane/doc/Images/doc/tabs in workspace.png</Path>
             <Path fileType="data">/usr/share/freeplane/doc/Images/examples.png</Path>
@@ -223,18 +223,15 @@
             <Path fileType="data">/usr/share/freeplane/doc/freeplane_menuposition_nl.jpg</Path>
             <Path fileType="data">/usr/share/freeplane/doc/history_en.txt</Path>
             <Path fileType="data">/usr/share/freeplane/framework.jar</Path>
-            <Path fileType="data">/usr/share/freeplane/freeplane.bat</Path>
             <Path fileType="data">/usr/share/freeplane/freeplane.l4j.ini</Path>
             <Path fileType="data">/usr/share/freeplane/freeplane.png</Path>
             <Path fileType="data">/usr/share/freeplane/freeplane.policy</Path>
             <Path fileType="data">/usr/share/freeplane/freeplane.sh</Path>
             <Path fileType="data">/usr/share/freeplane/freeplane.svg</Path>
             <Path fileType="data">/usr/share/freeplane/freeplaneConsole.l4j.ini</Path>
-            <Path fileType="data">/usr/share/freeplane/freeplaneIcons.dll</Path>
             <Path fileType="data">/usr/share/freeplane/freeplanelauncher.jar</Path>
             <Path fileType="data">/usr/share/freeplane/fwdir/condperm</Path>
             <Path fileType="data">/usr/share/freeplane/fwdir/perms</Path>
-            <Path fileType="data">/usr/share/freeplane/gitinfo.txt</Path>
             <Path fileType="data">/usr/share/freeplane/init.xargs</Path>
             <Path fileType="data">/usr/share/freeplane/plugins/org.freeplane.plugin.bugreport/META-INF/MANIFEST.MF</Path>
             <Path fileType="data">/usr/share/freeplane/plugins/org.freeplane.plugin.bugreport/lib/plugin-1.7.10.jar</Path>
@@ -301,7 +298,6 @@
             <Path fileType="data">/usr/share/freeplane/plugins/org.freeplane.plugin.svg/lib/xml-apis-ext-1.3.04.jar</Path>
             <Path fileType="data">/usr/share/freeplane/plugins/org.freeplane.plugin.svg/lib/xmlgraphics-commons-2.2.jar</Path>
             <Path fileType="data">/usr/share/freeplane/props.xargs</Path>
-            <Path fileType="data">/usr/share/freeplane/resources/gitinfo.properties</Path>
             <Path fileType="data">/usr/share/freeplane/resources/ortho/dictionary_de.ortho</Path>
             <Path fileType="data">/usr/share/freeplane/resources/ortho/dictionary_en.ortho</Path>
             <Path fileType="data">/usr/share/freeplane/resources/ortho/dictionary_fr.ortho</Path>
@@ -343,15 +339,18 @@
             <Path fileType="data">/usr/share/freeplane/resources/xslt/xbel2mm.xsl</Path>
             <Path fileType="data">/usr/share/freeplane/scripts/apiGenerator.groovy</Path>
             <Path fileType="data">/usr/share/freeplane/scripts/installScriptAddOn.groovy</Path>
+            <Path fileType="data">/usr/share/icons/hicolor/32x32/apps/freeplane.png</Path>
+            <Path fileType="data">/usr/share/icons/hicolor/scalable/apps/freeplane.svg</Path>
+            <Path fileType="data">/usr/share/mime/packages/freeplane.xml</Path>
         </Files>
     </Package>
     <History>
-        <Update release="8">
-            <Date>2019-11-28</Date>
+        <Update release="9">
+            <Date>2020-04-24</Date>
             <Version>1.7.10</Version>
             <Comment>Packaging update</Comment>
-            <Name>Algent Albrahimi</Name>
-            <Email>algent@protonmail.com</Email>
+            <Name>Fabio Forni</Name>
+            <Email>livingsilver94.solus@redaril.me</Email>
         </Update>
     </History>
 </PISI>
\ No newline at end of file