diff --git a/.SRCINFO b/.SRCINFO
index 1b954ba6668..44365a54370 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = ignition-math
 	pkgdesc = Math classes and functions for robot applications
 	pkgver = 6.4.0
-	pkgrel = 3
+	pkgrel = 4
 	url = https://ignitionrobotics.org/libs/math
 	arch = i686
 	arch = x86_64
@@ -10,8 +10,8 @@ pkgbase = ignition-math
 	makedepends = ignition-cmake>=2
 	depends = gcc-libs
 	optdepends = eigen
-	source = https://bitbucket.org/ignitionrobotics/ign-math/get/ignition-math6_6.4.0.tar.bz2
-	sha256sums = 5463d2ee5202ad60965a613361c1b12e34d3a8c49ad9037b16120f89b0250745
+	source = ignition-math-6.4.0::https://github.com/ignitionrobotics/ign-math/archive/ignition-math6_6.4.0.tar.gz
+	sha256sums = 2961b295c61c7536a10b4e87c1fb812d111ee923e1c83bb6a42dede7d76373c5
 
 pkgname = ignition-math
 
diff --git a/PKGBUILD b/PKGBUILD
index c58f5d75667..0cce684b69b 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,8 +1,9 @@
 # Maintainer: acxz <akashpatel2008 at yahoo dot com>
 # Contributor: Mykola Dolhyi <0xb000@gmail.com>
+# Contributor: Ramdambo <https://github.com/Ramdambo>
 pkgname=ignition-math
 pkgver=6.4.0
-pkgrel=3
+pkgrel=4
 pkgdesc="Math classes and functions for robot applications"
 arch=('i686' 'x86_64')
 url="https://ignitionrobotics.org/libs/math"
@@ -12,10 +13,10 @@ depends=('gcc-libs')
 makedepends=('ignition-cmake>=2')
 optdepends=('eigen')
 conflicts=()
-source=("https://bitbucket.org/ignitionrobotics/ign-math/get/${pkgname}6_${pkgver}.tar.bz2")
-sha256sums=('5463d2ee5202ad60965a613361c1b12e34d3a8c49ad9037b16120f89b0250745')
+source=("${pkgname}-${pkgver}.tar.gz::https://github.com/ignitionrobotics/ign-math/archive/${pkgname}6_${pkgver}.tar.gz")
+sha256sums=("2961b295c61c7536a10b4e87c1fb812d111ee923e1c83bb6a42dede7d76373c5")
 
-_dir="ignitionrobotics-ign-math-11bba67b3176"
+_dir="ign-math-${pkgname}6_${pkgver}"
 
 build() {
   cd "$srcdir/$_dir"
@@ -33,6 +34,7 @@ build() {
   make
 }
 
+
 package() {
   cd "$srcdir/$_dir/build"
   make DESTDIR="$pkgdir/" install