diff --git a/BoardConfigCommon.mk b/BoardConfigCommon.mk
index a0056fe..de7d1ef 100644
--- a/BoardConfigCommon.mk
+++ b/BoardConfigCommon.mk
@@ -62,6 +62,9 @@ MAX_EGL_CACHE_KEY_SIZE := 12*1024
 # of the device.
 MAX_EGL_CACHE_SIZE := 2048*1024
 
+# Filesystem
+TARGET_FS_CONFIG_GEN := device/samsung/msm8974-common/config.fs
+
 # HIDL
 DEVICE_MANIFEST_FILE := device/samsung/msm8974-common/manifest.xml
 DEVICE_MATRIX_FILE := device/samsung/msm8974-common/compatibility_matrix.xml
diff --git a/config.fs b/config.fs
new file mode 100644
index 0000000..14d23f5
--- /dev/null
+++ b/config.fs
@@ -0,0 +1,8 @@
+[AID_QCOM_DIAG]
+value:2950
+
+[AID_RFS]
+value:2951
+
+[AID_RFS_SHARED]
+value:2952