diff --git a/default.xml b/default.xml
index eadb8b6..cecec1d 100644
--- a/default.xml
+++ b/default.xml
@@ -3,7 +3,7 @@
   <remote  name="aosp"
            fetch="https://android.googlesource.com"
            review="https://android-review.googlesource.com/" />
-  <default revision="refs/tags/android-8.1.0_r32"
+  <default revision="refs/tags/android-8.1.0_r40"
            remote="aosp"
            sync-c="true"
            sync-j="12" />
diff --git a/omni-aosp.xml b/omni-aosp.xml
index be6ec06..7aee833 100644
--- a/omni-aosp.xml
+++ b/omni-aosp.xml
@@ -4,10 +4,14 @@
   <remote  name="github"
            fetch="https://github.com/" />
 
+  <remote  name="gitlab"
+           fetch="https://gitlab.com/" />
+
   <remote  name="omnirom"
            fetch="https://github.com/omnirom"
            review="gerrit.omnirom.org" />
 
+  <project path="art" name="android_art" remote="omnirom" revision="android-8.1" groups="pdk" />
   <project path="bionic" name="android_bionic" remote="omnirom" revision="android-8.1" groups="pdk" />
 
   <project path="build/make" name="android_build" remote="omnirom" revision="android-8.1" groups="pdk" >
@@ -29,7 +33,7 @@
   <project path="external/aac" name="android_external_aac" remote="omnirom" revision="android-8.1" />
   <project path="external/chromium-webview" name="android_external_chromium-webview" remote="omnirom" revision="android-8.1" />
   <project path="external/e2fsprogs" name="android_external_e2fsprogs" remote="omnirom" revision="android-8.1" />
-  <project path="external/f2fs-tools" name="android_external_f2fs-tools" remote="omnirom" revision="android-8.1" />  
+  <project path="external/f2fs-tools" name="android_external_f2fs-tools" remote="omnirom" revision="android-8.1" />
   <project path="external/mksh" name="android_external_mksh" remote="omnirom" revision="android-8.1" />
   <project path="external/tinycompress" name="android_external_tinycompress" remote="omnirom" revision="android-8.1" />
   <project path="external/selinux" name="android_external_selinux" remote="omnirom" revision="android-8.1" />
diff --git a/remove-minimal.xml b/remove-minimal.xml
index 1d7bc02..f083170 100644
--- a/remove-minimal.xml
+++ b/remove-minimal.xml
@@ -2,7 +2,6 @@
 <manifest>
 
     <!-- Remove from default.xml -->
-    <remove-project name="platform/art" />
     <remove-project name="platform/compatibility/cdd" />
     <remove-project name="platform/cts" />
     <remove-project name="platform/dalvik" />
@@ -394,6 +393,7 @@
 
 
     <!-- Remove from omni-aosp.xml (forked AOSP) -->
+    <remove-project name="android_art" />
     <remove-project name="android_development" />
 
     <remove-project name="android_external_aac" />
diff --git a/remove.xml b/remove.xml
index bbf65ad..4d77c49 100644
--- a/remove.xml
+++ b/remove.xml
@@ -8,6 +8,7 @@
   <remove-project name="device/google/wahoo" />
   <remove-project name="device/google/wahoo-kernel" />
 
+  <remove-project name="platform/art" />
   <remove-project name="platform/bionic" />
   <remove-project name="platform/build" />
   <remove-project name="platform/build/soong" />