diff --git a/metadata/com.gh4a.txt b/metadata/com.gh4a.txt
index 8b2fdab688..ba9b4ff996 100644
--- a/metadata/com.gh4a.txt
+++ b/metadata/com.gh4a.txt
@@ -54,6 +54,18 @@ Build:3.7.1,38
         $$MVN3$$ install && \
         popd
 
+Build:3.8,40
+    commit=v3.8.0
+    gradle=yes
+    srclibs=GH4AGitHubAPI@746ef8c843e4dfbd8505f72b6a2dbb23559f4ca6,PreferenceFragment@717a45433b
+    prebuild=rm -rf libs/*.jar && \
+        cp -a $$GH4AGitHubAPI$$/src/org src && \
+        sed -i -e '/\(populov\|kolavar\|kageiit\)/d' build.gradle && \
+        sed -i -e "s/compile.*preferencefragment.*/compile project('preferencefragment')/" build.gradle && \
+        echo -e "include ':preferencefragment'\nproject(':preferencefragment').projectDir = new File('../srclib/PreferenceFragment')" > settings.gradle && \
+        sed -i -e "s/0.10.+/1.0.0/" $$PreferenceFragment$$/build.gradle && \
+        sed -i -e '/[Cc]rashlytics/d' build.gradle AndroidManifest.xml src/com/gh4a/Gh4Application.java
+
 Auto Update Mode:None
 Update Check Mode:Tags
 Current Version:3.8
diff --git a/srclibs/GH4AGitHubAPI.txt b/srclibs/GH4AGitHubAPI.txt
index a4e30a73a8..86851c19e0 100644
--- a/srclibs/GH4AGitHubAPI.txt
+++ b/srclibs/GH4AGitHubAPI.txt
@@ -1,5 +1,5 @@
 Repo Type:git
-Repo:https://github.com/slapperwan/egit-github.git
+Repo:https://github.com/maniac103/egit-github.git
 
 Subdir:org.eclipse.egit.github.core