diff --git a/scripts/manifest_fixer.py b/scripts/manifest_fixer.py
index 9256cb2..07925df 100755
--- a/scripts/manifest_fixer.py
+++ b/scripts/manifest_fixer.py
@@ -61,6 +61,9 @@
                       help='specify additional <uses-library> tag to add. android:requred is set to false')
   parser.add_argument('--uses-non-sdk-api', dest='uses_non_sdk_api', action='store_true',
                       help='manifest is for a package built against the platform')
+  parser.add_argument('--prefer-integrity', type=bool, dest='prefer_integrity',
+                      help=('specify if the app prefers strict integrity. Should not be conflict if ' +
+                            'already declared in the manifest.'))
   parser.add_argument('input', help='input AndroidManifest.xml file')
   parser.add_argument('output', help='output AndroidManifest.xml file')
   return parser.parse_args()
@@ -269,6 +272,28 @@
     application.setAttributeNode(attr)
 
 
+def add_prefer_integrity(doc):
+  manifest = parse_manifest(doc)
+  elems = get_children_with_tag(manifest, 'application')
+  application = elems[0] if len(elems) == 1 else None
+  if len(elems) > 1:
+    raise RuntimeError('found multiple <application> tags')
+  elif not elems:
+    application = doc.createElement('application')
+    indent = get_indent(manifest.firstChild, 1)
+    first = manifest.firstChild
+    manifest.insertBefore(doc.createTextNode(indent), first)
+    manifest.insertBefore(application, first)
+
+  attr = application.getAttributeNodeNS(android_ns, 'preferIntegrity')
+  if attr is None:
+    attr = doc.createAttributeNS(android_ns, 'android:preferIntegrity')
+    attr.value = 'true'
+    application.setAttributeNode(attr)
+  elif attr.value != 'true':
+    raise RuntimeError('existing attribute mismatches the option of --prefer-integrity')
+
+
 def write_xml(f, doc):
   f.write('<?xml version="1.0" encoding="utf-8"?>\n')
   for node in doc.childNodes:
@@ -296,6 +321,9 @@
     if args.uses_non_sdk_api:
       add_uses_non_sdk_api(doc)
 
+    if args.prefer_integrity:
+      add_prefer_integrity(doc)
+
     with open(args.output, 'wb') as f:
       write_xml(f, doc)
 
