diff --git a/src/com/facebook/buck/cli/quickstart/android/.buckconfig b/src/com/facebook/buck/cli/quickstart/android/.buckconfig
index cacfdd8..6b11af8 100644
--- a/src/com/facebook/buck/cli/quickstart/android/.buckconfig
+++ b/src/com/facebook/buck/cli/quickstart/android/.buckconfig
@@ -1,2 +1,10 @@
 [alias]
     app = //apps/myapp:app
+[java]
+    src_roots = /java/
+[project]
+    # IntelliJ requires that every Android module have an
+    # AndroidManifest.xml file associated with it. In practice,
+    # most of this is unnecessary boilerplate, so we create one
+    # "shared" AndroidManifest.xml file that can be used as a default.
+    default_android_manifest = //res/AndroidManifest.xml
diff --git a/src/com/facebook/buck/cli/quickstart/android/res/AndroidManifest.xml b/src/com/facebook/buck/cli/quickstart/android/res/AndroidManifest.xml
new file mode 100644
index 0000000..0957736
--- /dev/null
+++ b/src/com/facebook/buck/cli/quickstart/android/res/AndroidManifest.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  This is the default AndroidManifest.xml used by Android library projects in
+  IntelliJ, as such projects need only the package attribute in order to
+  decide which Java package to use for the generated R.java file.
+
+  Because we use "com.facebook" as the package for all of our R.java files,
+  we can share the same AndroidManifest.xml for all of our our library projects.
+  This helps keep the /java/ directory clear of cruft.
+
+  There is a task filed to make Buck more flexible in terms of how we generate
+  R.java files:
+  https://our.intern.facebook.com/intern/tasks/?t=1820834
+-->
+<manifest xmlns:android="http://schemas.android.com/apk/res/android" package="com.example" />
diff --git a/src/com/facebook/buck/cli/quickstart/android/res/com/example/activity/BUCK b/src/com/facebook/buck/cli/quickstart/android/res/com/example/activity/BUCK
index beab38c..979b35c 100644
--- a/src/com/facebook/buck/cli/quickstart/android/res/com/example/activity/BUCK
+++ b/src/com/facebook/buck/cli/quickstart/android/res/com/example/activity/BUCK
@@ -9,4 +9,5 @@
 
 project_config(
   src_target = ':res',
+  src_roots = None,
 )