diff --git a/utils/aosp-forked-list b/utils/aosp-forked-list
index b1818d0..ad86142 100644
--- a/utils/aosp-forked-list
+++ b/utils/aosp-forked-list
@@ -1,78 +1,30 @@
-art
 bionic
-build
-dalvik
+build/make
+build/soong
 development
-external/clang
-external/doclava
-external/e2fsprogs
-external/f2fs-tools
-external/flac
-external/guava
-external/jhead
-external/libexif
-external/libnfc-nci
-external/libpng
-external/libxml2
-external/llvm
-external/lz4
-external/skia
-external/tinyalsa
 external/tinycompress
-external/toybox
+external/selinux
 frameworks/av
 frameworks/base
-frameworks/ex
-frameworks/native
-frameworks/opt/colorpicker
-frameworks/opt/net/ims
-frameworks/opt/net/voip
-frameworks/opt/net/wifi
 frameworks/opt/telephony
-frameworks/opt/timezonepicker
-frameworks/support
-frameworks/webview
-frameworks/wilhelm
-hardware/broadcom/libbt
-hardware/broadcom/wlan
 hardware/invensense
 hardware/libhardware
-hardware/libhardware_legacy
 hardware/qcom/audio
 hardware/qcom/bt
-hardware/qcom/camera
 hardware/qcom/display
 hardware/qcom/gps
 hardware/qcom/keymaster
 hardware/qcom/media
 hardware/qcom/power
 hardware/qcom/wlan
-hardware/ril
-libcore
-packages/apps/Bluetooth
-packages/apps/Camera2
-packages/apps/Contacts
-packages/apps/ContactsCommon
-packages/apps/Dialer
-packages/apps/Email
+packages/apps/Calendar
 packages/apps/Launcher3
-packages/apps/Messaging
+packages/apps/Gallery2
+packages/apps/MusicFX
 packages/apps/Nfc
-packages/apps/PackageInstaller
-packages/apps/PhoneCommon
-packages/apps/QuickSearchBox
 packages/apps/Settings
-packages/apps/UnifiedEmail
-packages/apps/WallpaperPicker
 packages/inputmethods/LatinIME
-packages/providers/DownloadProvider
-packages/providers/MediaProvider
-packages/providers/TelephonyProvider
-packages/services/Telecomm
-packages/services/Telephony
 system/core
-system/extras
 system/media
-system/netd
 system/sepolicy
 system/vold
diff --git a/utils/aosp-merge.sh b/utils/aosp-merge.sh
index 87d120f..7599b82 100755
--- a/utils/aosp-merge.sh
+++ b/utils/aosp-merge.sh
@@ -26,6 +26,9 @@
     do
 
     project=`echo android_${path} | sed -e 's/\//\_/g'`
+    if [ "${project}" == "android_build_make" ] ; then
+        project="android_build"
+    fi
 
     echo ""
     echo "====================================================================="
diff --git a/utils/aosp-push-merge.sh b/utils/aosp-push-merge.sh
index eeb24b5..f8aff4d 100755
--- a/utils/aosp-push-merge.sh
+++ b/utils/aosp-push-merge.sh
@@ -19,7 +19,7 @@
 
 url="gerrit.omnirom.org"
 port="29418"
-branch="android-7.1"
+branch="android-8.0"
 
 cd ../../../
 
@@ -27,6 +27,9 @@
     do
 
     project=`echo android_${path} | sed -e 's/\//\_/g'`
+    if [ "${project}" == "android_build_make" ] ; then
+        project="android_build"
+    fi
 
     echo ""
     echo "====================================================================="