diff --git a/srcpkgs/libqalculate-data b/srcpkgs/libqalculate-data
new file mode 120000
index 0000000000..2cf8203b78
--- /dev/null
+++ b/srcpkgs/libqalculate-data
@@ -0,0 +1 @@
+qalculate
\ No newline at end of file
diff --git a/srcpkgs/qalculate-gtk/template b/srcpkgs/qalculate-gtk/template
index ae9ffc13aa..8d5683444c 100644
--- a/srcpkgs/qalculate-gtk/template
+++ b/srcpkgs/qalculate-gtk/template
@@ -1,13 +1,13 @@
 # Template file for 'qalculate-gtk'
 pkgname=qalculate-gtk
-version=0.9.7
+version=0.9.8
 revision=1
 build_style=gnu-configure
 maintainer="Dominik Honnef <dominik@honnef.co>"
-hostmakedepends="intltool pkg-config rarian-devel"
-makedepends="libqalculate-devel gdk-pixbuf-devel libglade-devel gtk+-devel"
+hostmakedepends="intltool pkg-config"
+makedepends="libqalculate-devel gdk-pixbuf-devel gtk+3-devel"
 license="GPL-2"
-homepage="http://qalculate.sourceforge.net/"
-short_desc="A multi-purpose desktop calculator - GTK version"
-distfiles="${SOURCEFORGE_SITE}/qalculate/qalculate-gtk-${version}.tar.gz"
-checksum=a4ea8ee2366ac3ad53bb17fd2f76a7bed7211640cf2fdadfcf3b79eb4b37282d
+homepage="https://qalculate.github.io/"
+short_desc="A multi-purpose desktop calculator - GTK+ version"
+distfiles="https://github.com/Qalculate/qalculate-gtk/files/316290/qalculate-gtk-${version}.tar.gz"
+checksum=0ee6c239def411515fd35a0dca8b3fd144e8a41c19709ef0ee094b3db4ceda30
diff --git a/srcpkgs/qalculate/template b/srcpkgs/qalculate/template
index 3fe9574382..a046b07f5d 100644
--- a/srcpkgs/qalculate/template
+++ b/srcpkgs/qalculate/template
@@ -1,33 +1,40 @@
 # Template file for 'qalculate'
 pkgname=qalculate
-version=0.9.7
+version=0.9.8
+revision=1
 wrksrc="lib${pkgname}-${version}"
-revision=2
 build_style=gnu-configure
 maintainer="Dominik Honnef <dominik@honnef.co>"
 hostmakedepends="intltool pkg-config"
 makedepends="libxml2-devel glib-devel cln-devel readline-devel"
 license="GPL-2"
-homepage="http://qalculate.sourceforge.net/"
+homepage="https://qalculate.github.io/"
 short_desc="A multi-purpose desktop calculator"
-distfiles="${SOURCEFORGE_SITE}/qalculate/lib${pkgname}-${version}.tar.gz"
-checksum=9a6d97ce3339d104358294242c3ecd5e312446721e93499ff70acc1604607955
+distfiles="https://github.com/Qalculate/libqalculate/files/316260/libqalculate-${version}.tar.gz"
+checksum=0dd74d36885ab8d98f1268e17950426af2eb93ab9e819703ded230b042cceb5c
 
+libqalculate-data_package() {
+	noarch=yes
+	short_desc+=" - data files"
+	pkg_install() {
+		vmove usr/share/qalculate
+	}
+}
 libqalculate_package() {
 	short_desc+=" - library files"
+	depends="libqalculate-data>=${version}_${revision}"
 	pkg_install() {
 		vmove usr/lib/libqalculate.so.*
 	}
 }
-
 libqalculate-devel_package() {
 	short_desc+=" - development files"
 	depends="libqalculate>=${version}_${revision} glib-devel libxml2-devel cln-devel"
 	pkg_install() {
 		vmove usr/lib/*.so
 		vmove usr/lib/*.a
-		vmove usr/lib/pkgconfig/
-		vmove usr/include/
-		vmove usr/share/doc/libqalculate-0.9.7/
+		vmove usr/lib/pkgconfig
+		vmove usr/include
+		vmove usr/share/doc
 	}
 }