diff --git a/default.xml b/default.xml
index e1ea9f8..514f798 100644
--- a/default.xml
+++ b/default.xml
@@ -15,10 +15,6 @@
            review="gerrit.omnirom.org"
            fetch="https://github.com/omnirom" />
 
-  <remote  name="TeamWin"
-           review="gerrit.twrp.me"
-           fetch="https://github.com/TeamWin" />
-
   <default revision="refs/tags/android-6.0.1_r74"
            remote="aosp"
            sync-c="true"
@@ -32,7 +28,7 @@
   <!-- project path="abi/cpp" name="platform/abi/cpp" groups="pdk" /> -->
   <!-- project path="art" name="android_art" remote="omnirom" revision="android-6.0" groups="pdk" /> -->
   <project path="bionic" name="android_bionic" remote="omnirom" revision="android-6.0" groups="pdk" />
-  <project path="bootable/recovery" name="android_bootable_recovery" remote="TeamWin" revision="android-9.0" groups="pdk-cw-fs"/>
+  <!--project path="bootable/recovery" name="android_bootable_recovery" remote="omnirom" revision="android-6.0" groups="pdk-cw-fs"/> -->
   <!-- project path="cts" name="platform/cts" groups="cts,pdk-cw-fs" /> -->
   <!-- project path="dalvik" name="android_dalvik" remote="omnirom" revision="android-6.0" groups="pdk-cw-fs" /> -->
   <!-- project path="developers/build" name="platform/developers/build" /> -->
@@ -490,4 +486,7 @@
   <project path="vendor/omni" name="android_vendor_omni" remote="omnirom" revision="android-6.0" />
   <!-- project path="packages/apps/MonthCalendarWidget" name="android_packages_apps_MonthCalendarWidget" remote="omnirom" revision="android-6.0" /> -->
 
+  <!-- LAST: Add/Replace repos and particular directories needed by TWRP -->
+  <include name="twrp-extras.xml"/>
+
 </manifest>
diff --git a/twrp-extras.xml b/twrp-extras.xml
new file mode 100644
index 0000000..60eb8fb
--- /dev/null
+++ b/twrp-extras.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<manifest>
+    <remote name="TeamWin"
+            fetch="https://github.com/TeamWin"
+            review="https://gerrit.twrp.me" />
+
+    <remote name="LineageOS"
+            fetch="https://github.com/LineageOS"
+            review="https://review.lineageos.org" />
+
+<!-- TWRP lives in TeamWin android-9.0 -->
+    <project path="bootable/recovery" name="android_bootable_recovery" remote="TeamWin" revision="android-9.0"/>
+
+<!-- Include external LineageOS repos for nano -->
+    <project name="android_external_nano" path="external/nano" remote="LineageOS" revision="cm-13.0" />
+    <project name="android_external_libncurses" path="external/libncurses" remote="LineageOS" revision="cm-13.0" />
+    <project name="android_external_openssh" path="external/openssh" remote="LineageOS" revision="cm-13.0" />
+</manifest>
+