diff --git a/microdroid/Android.bp b/microdroid/Android.bp
index a2ae144..8702568 100644
--- a/microdroid/Android.bp
+++ b/microdroid/Android.bp
@@ -157,16 +157,34 @@
 
 genrule {
     name: "microdroid_build_prop_gen_x86_64",
-    srcs: ["build.prop"],
+    srcs: [
+        "build.prop",
+        ":buildinfo.prop",
+    ],
     out: ["build.prop.out"],
-    cmd: "cp $(in) $(out); echo ro.product.cpu.abilist=x86_64 >> $(out)",
+    cmd: "(echo '# build properties from buildinfo.prop module' && " +
+        "grep ro\\.build\\.version\\.codename= $(location :buildinfo.prop) && " +
+        "grep ro\\.build\\.version\\.release= $(location :buildinfo.prop) && " +
+        "grep ro\\.build\\.version\\.sdk= $(location :buildinfo.prop) && " +
+        "grep ro\\.build\\.version\\.security_patch= $(location :buildinfo.prop) && " +
+        "cat $(location build.prop) && " +
+        "echo ro.product.cpu.abilist=x86_64) > $(out)",
 }
 
 genrule {
     name: "microdroid_build_prop_gen_arm64",
-    srcs: ["build.prop"],
+    srcs: [
+        "build.prop",
+        ":buildinfo.prop",
+    ],
     out: ["build.prop.out"],
-    cmd: "cp $(in) $(out); echo ro.product.cpu.abilist=arm64-v8a >> $(out)",
+    cmd: "(echo '# build properties from buildinfo.prop module' && " +
+        "grep ro\\.build\\.version\\.codename= $(location :buildinfo.prop) && " +
+        "grep ro\\.build\\.version\\.release= $(location :buildinfo.prop) && " +
+        "grep ro\\.build\\.version\\.sdk= $(location :buildinfo.prop) && " +
+        "grep ro\\.build\\.version\\.security_patch= $(location :buildinfo.prop) && " +
+        "cat $(location build.prop) && " +
+        "echo ro.product.cpu.abilist=arm64-v8a) > $(out)",
 }
 
 android_filesystem {