diff --git a/Android.mk b/Android.mk
index 36f562f..ab79031 100644
--- a/Android.mk
+++ b/Android.mk
@@ -1,9 +1,6 @@
 LOCAL_PATH := $(call my-dir)
-include $(CLEAR_VARS)
 
-LOCAL_CPP_EXTENSION := .cc
-
-LOCAL_SRC_FILES := \
+sgdisk_src_files := \
     sgdisk.cc \
     gptcl.cc \
     crc32.cc \
@@ -21,9 +18,29 @@
     diskio-unix.cc \
     android_popt.cc \
 
+include $(CLEAR_VARS)
+
+LOCAL_CPP_EXTENSION := .cc
+
+LOCAL_C_INCLUDES := $(LOCAL_PATH) external/e2fsprogs/lib
+LOCAL_SRC_FILES := $(sgdisk_src_files)
+
 LOCAL_SHARED_LIBRARIES := libext2_uuid
 
-LOCAL_MODULE_TAGS := optional
 LOCAL_MODULE := sgdisk
 
 include $(BUILD_EXECUTABLE)
+
+include $(CLEAR_VARS)
+
+LOCAL_CPP_EXTENSION := .cc
+
+LOCAL_C_INCLUDES := $(LOCAL_PATH) external/e2fsprogs/lib
+LOCAL_SRC_FILES := $(sgdisk_src_files)
+
+LOCAL_SHARED_LIBRARIES := libext2_uuid_host
+
+LOCAL_MODULE := sgdisk_host
+LOCAL_MODULE_STEM := sgdisk
+
+include $(BUILD_HOST_EXECUTABLE)