diff --git a/build.sh b/build.sh
index 5819462..efad282 100755
--- a/build.sh
+++ b/build.sh
@@ -28,14 +28,6 @@ commands:
 EOF
 }
 
-append_seandroidenforce() {
-    local img="$1"
-    
-    [ -f "$img" ] || return
-    tail -c 16 "$img" | grep -q "SEANDROIDNEFORCE" || \
-	printf 'SEANDROIDENFORCE' >> "$img"
-}
-
 do_build() {
     mkdir -p "$BUILD"
     cd "$BUILD"
@@ -80,11 +72,11 @@ do_build() {
     fi
 
     rlte_print "Commencing build (command: $CMD)"
-    mka "$CMD"
 
-    if [ "$CMD" != "clean" ]; then
-	rlte_print "Appending SEANDROIDENFORCE"
-        append_seandroidenforce "$BUILD/out/target/product/rubenslte/boot.img"
+    if [ "$CMD" = "recoveryimage" ]; then
+	WITH_TWRP=true mka "$CMD"
+    else
+	mka "$CMD"
     fi
 
     rlte_ok "Done."
@@ -101,7 +93,7 @@ done
 shift $((OPTIND - 1))
 
 case "${1:-}" in
-    bootimage|bacon|clean) CMD="${1:-}"; do_build ;;
+    bootimage|recoveryimage|bacon|clean) CMD="${1:-}"; do_build ;;
     prune) rm -rf "$BUILD" ;;
     *) usage; exit 1 ;;
 esac
diff --git a/manifest.xml b/manifest.xml
index 6cdd951..f09a533 100644
--- a/manifest.xml
+++ b/manifest.xml
@@ -2,7 +2,8 @@
 <manifest>
   <remote name="gitea" fetch="https://git.cfpi-fpsi.eu/rubenslte" />
   <remote name="los" fetch="https://github.com/LineageOS" />
-
+  <remote name="twrp" fetch="https://github.com/TeamWin" />
+  
   <project path="device/qcom/common"
            name="android_device_qcom_common"
            remote="los" revision="cm-14.1" />
@@ -27,6 +28,14 @@
            name="platform/external/chromium-webview"
            remote="aosp" revision="nougat-mr1.2-release" />
 
+  <!-- For building TWRP. -->
+  <project path="external/busybox"
+           name="android_external_busybox"
+           remote="los" revision="cm-14.1" />
+  <project path="bootable/recovery-twrp"
+	   name="android_bootable_recovery"
+	   remote="twrp" revision="android-5.1" />
+  
   <remove-project name="LineageOS/android_external_chromium-webview_prebuilt_arm" />
   <remove-project name="LineageOS/android_external_chromium-webview_prebuilt_arm64" />
   <remove-project name="LineageOS/android_external_chromium-webview_prebuilt_x86" />