diff --git a/math/geogebra/Makefile b/math/geogebra/Makefile
index 8efb53e9eee4..287620fe94c7 100644
--- a/math/geogebra/Makefile
+++ b/math/geogebra/Makefile
@@ -1,46 +1,48 @@
 # Created by: Nicola Vitale	<nivit@email.it>
 
 PORTNAME=	geogebra
 PORTVERSION=	5.0.625.0
+PORTREVISION=	1
 CATEGORIES=	math education java
 MASTER_SITES=	http://download.geogebra.org/installers/5.0/ \
 		https://static.geogebra.org/images/ \
 		http://freebsd.uzsolt.hu/src/
 DISTNAME=	GeoGebra-Linux-Portable-${PORTVERSION:S/./-/g}
 DISTFILES=	${DISTNAME}${EXTRACT_SUFX} geogebra.png geogebra-logo.svg
 EXTRACT_ONLY=	${DISTNAME}${EXTRACT_SUFX}
 
 MAINTAINER=	uzsolt@uzsolt.hu
 COMMENT=	Dynamic software that joins geometry, algebra, and calculus
 
 LICENSE=	GEOGEBRA
 LICENSE_NAME=	GeoGebra Non-Commercial License Agreement
 LICENSE_FILE=	${WRKSRC}/LICENSE.txt
 LICENSE_PERMS=	dist-mirror no-dist-sell pkg-mirror no-pkg-sell auto-accept
 
 ONLY_FOR_ARCHS=	amd64 i386
 
-USES=		tar:bzip2 desktop-file-utils gnome shebangfix
+USES=		tar:bzip2 desktop-file-utils gnome shebangfix shared-mime-info
 USE_JAVA=	yes
 
 CONFLICTS=	math/geogebra-i18n
 
 NO_BUILD=	yes
 NO_ARCH=	yes
 WRKSRC=		${WRKDIR}/${DISTNAME}
 
 SUB_FILES=	geogebra.desktop geogebra.sh
 SUB_LIST=	JAVA=${JAVA}
 
 do-install:
 	@${MKDIR} ${STAGEDIR}${DATADIR}/${PORTNAME}
 	${INSTALL_SCRIPT} ${WRKDIR}/geogebra.sh ${STAGEDIR}${PREFIX}/bin/${PORTNAME}
 	${INSTALL_DATA} ${WRKSRC}/geogebra/*.jar ${STAGEDIR}${DATADIR}/${PORTNAME}
 	@${MKDIR} ${STAGEDIR}${PREFIX}/share/mime/packages
+	${INSTALL_DATA} ${FILESDIR}/geogebra-mime.xml ${STAGEDIR}${PREFIX}/share/mime/packages
 	${INSTALL_DATA} ${WRKDIR}/geogebra.desktop ${STAGEDIR}${DESKTOPDIR}
 	@${MKDIR} ${STAGEDIR}${PREFIX}/share/icons/hicolor/32x32/apps
 	@${MKDIR} ${STAGEDIR}${PREFIX}/share/icons/hicolor/scalable/apps
 	${INSTALL_DATA} ${DISTDIR}/geogebra.png ${STAGEDIR}${PREFIX}/share/icons/hicolor/32x32/apps/geogebra.png
 	${INSTALL_DATA} ${DISTDIR}/geogebra-logo.svg ${STAGEDIR}${PREFIX}/share/icons/hicolor/scalable/apps/geogebra.svg
 
 .include <bsd.port.mk>
diff --git a/math/geogebra/files/geogebra-mime.xml b/math/geogebra/files/geogebra-mime.xml
new file mode 100644
index 000000000000..6f6ae5d9b2a6
--- /dev/null
+++ b/math/geogebra/files/geogebra-mime.xml
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<mime-info xmlns="http://www.freedesktop.org/standards/shared-mime-info">
+  <mime-type type="application/vnd.geogebra.file">
+         <comment>GeoGebra worksheet</comment>
+         <comment xml:lang="cs">Pracovní list GeoGebry</comment>
+         <comment xml:lang="de">GeoGebra-Arbeitsblatt</comment>
+         <comment xml:lang="es">Archivo GeoGebra</comment>
+         <comment xml:lang="fr">Feuille de travail GeoGebra </comment>
+         <comment xml:lang="hi">जीओ-जेब्रा कार्य-पत्र</comment>
+         <comment xml:lang="it">Foglio di lavoro GeoGebra </comment>
+         <comment xml:lang="pt-BR">Planilha GeoGebra</comment>
+         <sub-class-of type="application/zip"/>
+         <glob pattern="*.ggb"/>
+         <icon name="geogebra"/>
+  </mime-type>
+  <mime-type type="application/vnd.geogebra.tool">
+         <comment>GeoGebra tool</comment>
+         <comment xml:lang="cs">Nástroj GeoGebry</comment>
+         <comment xml:lang="de">GeoGebra-Werkzeug</comment>
+         <comment xml:lang="es">Herramienta GeoGebra</comment>
+         <comment xml:lang="fr">Outil GeoGebra</comment>
+         <comment xml:lang="hi">जीओ-जेब्रा साधन</comment>
+         <comment xml:lang="it">Strumento GeoGebra</comment>
+         <comment xml:lang="pt-BR">Ferramenta GeoGebra</comment>
+         <sub-class-of type="application/zip"/>
+         <glob pattern="*.ggt"/>
+         <icon name="geogebra"/>
+  </mime-type>
+</mime-info>
diff --git a/math/geogebra/pkg-plist b/math/geogebra/pkg-plist
index ef622dc2d882..4ef2328e4afd 100644
--- a/math/geogebra/pkg-plist
+++ b/math/geogebra/pkg-plist
@@ -1,24 +1,25 @@
 bin/geogebra
 share/applications/geogebra.desktop
 share/icons/hicolor/32x32/apps/geogebra.png
 share/icons/hicolor/scalable/apps/geogebra.svg
 %%DATADIR%%/geogebra/OpenGeoProver.jar
 %%DATADIR%%/geogebra/geogebra.jar
 %%DATADIR%%/geogebra/geogebra_3d.jar
 %%DATADIR%%/geogebra/geogebra_algos.jar
 %%DATADIR%%/geogebra/geogebra_cas.jar
 %%DATADIR%%/geogebra/geogebra_export.jar
 %%DATADIR%%/geogebra/geogebra_gui.jar
 %%DATADIR%%/geogebra/geogebra_javascript.jar
 %%DATADIR%%/geogebra/geogebra_main.jar
 %%DATADIR%%/geogebra/geogebra_properties.jar
 %%DATADIR%%/geogebra/gluegen-rt-natives-linux-amd64.jar
 %%DATADIR%%/geogebra/gluegen-rt-natives-linux-i586.jar
 %%DATADIR%%/geogebra/gluegen-rt.jar
 %%DATADIR%%/geogebra/javagiac-linux32.jar
 %%DATADIR%%/geogebra/javagiac-linux64.jar
 %%DATADIR%%/geogebra/jlatexmath.jar
 %%DATADIR%%/geogebra/jogl.all-natives-linux-amd64.jar
 %%DATADIR%%/geogebra/jogl.all-natives-linux-i586.jar
 %%DATADIR%%/geogebra/jogl.all.jar
+share/mime/packages/geogebra-mime.xml
 @dir share/mime/packages