diff --git a/core/user_tags.mk b/core/user_tags.mk
index 7800710191..6b115c3d30 100644
--- a/core/user_tags.mk
+++ b/core/user_tags.mk
@@ -53,6 +53,8 @@ GRANDFATHERED_USER_MODULES += \
 	asm-3.1 \
 	atree \
 	audio \
+	badblocks \
+	badblocks_host \
 	bb2sym \
 	bb_dump \
 	bbprof \
@@ -100,6 +102,8 @@ GRANDFATHERED_USER_MODULES += \
 	dumpstate \
 	dumpsys \
 	dx-tests \
+	e2fsck \
+	e2fsck_host \
 	easymock \
 	edify \
 	emmalib \
@@ -219,6 +223,18 @@ GRANDFATHERED_USER_MODULES += \
 	libETC1 \
 	libexif \
 	libext \
+	libext2fs \
+	libext2fs_host \
+	libext2_blkid \
+	libext2_blkid_host \
+	libext2_com_err \
+	libext2_com_err_host \
+	libext2_e2p \
+	libext2_e2p_host \
+	libext2_profile \
+	libext2_profile_host \
+	libext2_uuid \
+	libext2_uuid_host \
 	libfdlibm \
 	libfdlibm-host \
 	libFFTEm \
@@ -375,6 +391,8 @@ GRANDFATHERED_USER_MODULES += \
 	minigzip \
 	mkbootfs \
 	mkbootimg \
+	mke2fs \
+	mke2fs_host \
 	mksdcard \
 	mksnapshot \
 	mkstubs \
@@ -417,6 +435,8 @@ GRANDFATHERED_USER_MODULES += \
 	read_method \
 	read_pid \
 	read_trace \
+	resize2fs \
+	resize2fs_host \
 	rgb2565 \
 	rild \
 	rsg-generator \
@@ -466,6 +486,8 @@ GRANDFATHERED_USER_MODULES += \
 	test_zipfile \
 	toolbox \
 	traceview \
+	tune2fs \
+	tune2fs_host \
 	tuttle2.kcm \
 	uix \
 	usbtest \