diff --git a/rules/i2c-tools/default.bash b/rules/i2c-tools/default.bash
index 53685c9..0eab8fe 100644
--- a/rules/i2c-tools/default.bash
+++ b/rules/i2c-tools/default.bash
@@ -1,16 +1,18 @@
 version=\
 (
-    '3.0.2'
+    '3.1.0'
 )
 
+git_tag="$(echo $version | sed 's/\./-/g')"
+
 url=\
 (
-    "http://www.lsts.pt/glued/i2c-tools-$version.tar.bz2"
+    "https://github.com/groeck/i2c-tools/archive/V$git_tag.tar.gz"
 )
 
 md5=\
 (
-    'b546345ac19db56719dea6b8199f11e0'
+    '7ed75853fe3c3dfd2d0d70d5831abfef'
 )
 
 maintainer=\
@@ -20,12 +22,12 @@ maintainer=\
 
 build()
 {
-    $cmd_make CC="$cmd_target_cc"
+    $cmd_make -C "../i2c-tools-$git_tag" CC="$cmd_target_cc"
 }
 
 target_install()
 {
-    $cmd_target_strip tools/i2cdetect -o "$cfg_dir_rootfs/usr/bin/i2cdetect" &&
-    $cmd_target_strip tools/i2cget -o "$cfg_dir_rootfs/usr/bin/i2cget" &&
-    $cmd_target_strip tools/i2cset -o "$cfg_dir_rootfs/usr/bin/i2cset"
+    for t in i2cdetect i2cget i2cset; do
+        $cmd_target_strip "../i2c-tools-$git_tag/tools/$t" -o "$cfg_dir_rootfs/usr/bin/$t"
+    done
 }