--- a/mobile/android/base/java/org/mozilla/gecko/distribution/Distribution.java
+++ b/mobile/android/base/java/org/mozilla/gecko/distribution/Distribution.java
@@ -638,17 +638,17 @@ public class Distribution {
     }
 
     /**
      * @return true if we copied files out of the APK. Sets distributionDir in that case.
      */
     private boolean copyAndCheckAPKDistribution() {
         try {
             // First, try copying distribution files out of the APK.
-            if (copyFiles()) {
+            if (copyFilesFromPackagedAssets()) {
                 // We always copy to the data dir, and we only copy files from
                 // a 'distribution' subdirectory. Now determine our actual distribution directory.
                 return checkDataDistribution();
             }
         } catch (IOException e) {
             Log.e(LOGTAG, "Error copying distribution files from APK.", e);
         }
         return false;
@@ -713,42 +713,48 @@ public class Distribution {
 
             writeStream(jar, outFile, entry.getTime(), buffer);
         }
 
         return distributionSet;
     }
 
     /**
-     * Copies the /distribution folder out of the APK and into the app's data directory.
+     * Copies the /assets/distribution folder out of the APK and into the app's data directory.
      * Returns true if distribution files were found and copied.
      */
-    private boolean copyFiles() throws IOException {
+    private boolean copyFilesFromPackagedAssets() throws IOException {
         final File applicationPackage = new File(packagePath);
         final ZipFile zip = new ZipFile(applicationPackage);
 
+        final String assetsPrefix = "assets/";
+        final String fullPrefix = assetsPrefix + DISTRIBUTION_PATH;
+
         boolean distributionSet = false;
         try {
             final byte[] buffer = new byte[1024];
 
             final Enumeration<? extends ZipEntry> zipEntries = zip.entries();
             while (zipEntries.hasMoreElements()) {
                 final ZipEntry fileEntry = zipEntries.nextElement();
                 final String name = fileEntry.getName();
 
                 if (fileEntry.isDirectory()) {
                     // We'll let getDataFile deal with creating the directory hierarchy.
                     continue;
                 }
 
-                if (!name.startsWith(DISTRIBUTION_PATH)) {
+                // Read from "assets/distribution/**".
+                if (!name.startsWith(fullPrefix)) {
                     continue;
                 }
 
-                final File outFile = getDataFile(name);
+                // Write to "distribution/**".
+                final String nameWithoutPrefix = name.substring(assetsPrefix.length());
+                final File outFile = getDataFile(nameWithoutPrefix);
                 if (outFile == null) {
                     continue;
                 }
 
                 distributionSet = true;
 
                 final InputStream fileStream = zip.getInputStream(fileEntry);
                 try {