diff --git a/MyTracks/AndroidManifest.xml b/MyTracks/AndroidManifest.xml
index 825601226..4916a09c5 100755
--- a/MyTracks/AndroidManifest.xml
+++ b/MyTracks/AndroidManifest.xml
@@ -198,35 +198,6 @@ limitations under the License.
       android:name="com.google.android.backup.api_key"
       android:value="AEdPqrEAAAAIi-_QiwoRSc9_bAC9cmuNXTQyU8ajJmGtKdhskQ" />
 
-    <!-- Permission to receive My Tracks internal broadcasts -->
-    <permission
-      android:description="@string/permission_notification_label"
-      android:label="@string/permission_notification_label"
-      android:name="com.google.android.apps.mytracks.MYTRACKS_NOTIFICATIONS"
-      android:permissionGroup="android.permission-group.LOCATION"
-      android:protectionLevel="signature" />
-    <!-- Permission to read track data -->
-    <permission
-      android:description="@string/permission_read_description"
-      android:label="@string/permission_read_label"
-      android:name="com.google.android.apps.mytracks.READ_TRACK_DATA"
-      android:permissionGroup="android.permission-group.LOCATION"
-      android:protectionLevel="dangerous" />
-    <!-- Permission to receive track start/end broadcasts -->
-    <permission
-      android:description="@string/permission_notification_description"
-      android:label="@string/permission_notification_label"
-      android:name="com.google.android.apps.mytracks.TRACK_NOTIFICATIONS"
-      android:permissionGroup="android.permission-group.LOCATION"
-      android:protectionLevel="dangerous" />
-    <!-- Permission to write track data, either directly or through service calls -->
-    <permission
-      android:description="@string/permission_write_description"
-      android:label="@string/permission_write_label"
-      android:name="com.google.android.apps.mytracks.WRITE_TRACK_DATA"
-      android:permissionGroup="android.permission-group.LOCATION"
-      android:protectionLevel="dangerous" />
-
     <!-- My Tracks data provider -->
     <provider
       android:authorities="com.google.android.maps.mytracks"
@@ -269,88 +240,117 @@ limitations under the License.
         android:resource="@xml/track_widget_info" />
     </receiver>
 
-    <supports-screens
-      android:anyDensity="true"
-      android:largeScreens="true"
-      android:normalScreens="true"
-      android:smallScreens="true"
-      android:xlargeScreens="true" />
-
-    <!-- Required features -->
-    <uses-feature
-      android:name="android.hardware.location"
-      android:required="true" />
-    <uses-feature
-      android:name="android.hardware.location.gps"
-      android:required="true" />
-
-    <!-- Optional features -->
-    <uses-feature
-      android:name="android.hardware.bluetooth"
-      android:required="false" />
-    <uses-feature
-      android:name="android.hardware.faketouch"
-      android:required="false" />
-    <uses-feature
-      android:name="android.hardware.location.network"
-      android:required="false" />
-    <uses-feature
-      android:name="android.hardware.sensor.compass"
-      android:required="false" />
-    <uses-feature
-      android:name="android.hardware.telephony"
-      android:required="false" />
-    <uses-feature
-      android:name="android.hardware.telephony.gsm"
-      android:required="false" />
-    <uses-feature
-      android:name="android.hardware.touchscreen"
-      android:required="false" />
-    <uses-feature
-      android:name="android.hardware.touchscreen.multitouch"
-      android:required="false" />
-
     <uses-library android:name="com.google.android.maps" />
-
-    <!-- Permission to initialize services -->
-    <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED" />
-
-    <!-- Permissions to record locations -->
-    <uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION" />
-    <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" />
-    <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
-    <uses-permission android:name="android.permission.WAKE_LOCK" />
-
-    <!-- Permissions to access sensors -->
-    <uses-permission android:name="com.dsi.ant.permission.ANT" />
-    <uses-permission android:name="com.dsi.ant.permission.ANT_ADMIN" />
-    <uses-permission android:name="android.permission.BLUETOOTH" />
-    <uses-permission android:name="android.permission.BLUETOOTH_ADMIN" />
-
-    <!-- Permissions to upload tracks -->
-    <uses-permission android:name="android.permission.GET_ACCOUNTS" />
-    <uses-permission android:name="android.permission.INTERNET" />
-    <uses-permission android:name="android.permission.MANAGE_ACCOUNTS" />
-    <uses-permission android:name="android.permission.USE_CREDENTIALS" />
-    <uses-permission android:name="com.google.android.googleapps.permission.GOOGLE_AUTH" />
-    <uses-permission android:name="com.google.android.googleapps.permission.GOOGLE_AUTH.fusiontables" />
-    <uses-permission android:name="com.google.android.googleapps.permission.GOOGLE_AUTH.local" />
-    <uses-permission android:name="com.google.android.googleapps.permission.GOOGLE_AUTH.wise" />
-    <uses-permission android:name="com.google.android.googleapps.permission.GOOGLE_AUTH.writely" />
-    <uses-permission android:name="com.google.android.providers.gsf.permission.READ_GSERVICES" />
-
-    <!-- Permission to read phone state so voice announcement will not interrupt ongoing calls -->
-    <uses-permission android:name="android.permission.READ_PHONE_STATE" />
-
-    <!-- Permission to write to SD card -->
-    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
-
-    <!-- Permissions to access My Tracks data -->
-    <uses-permission android:name="com.google.android.apps.mytracks.MYTRACKS_NOTIFICATIONS" />
-    <uses-permission android:name="com.google.android.apps.mytracks.READ_TRACK_DATA" />
-    <uses-permission android:name="com.google.android.apps.mytracks.WRITE_TRACK_DATA" />
-
-    <uses-sdk android:minSdkVersion="7" />
   </application>
 
+  <!-- Permission to receive My Tracks internal broadcasts -->
+  <permission
+    android:description="@string/permission_notification_label"
+    android:label="@string/permission_notification_label"
+    android:name="com.google.android.apps.mytracks.MYTRACKS_NOTIFICATIONS"
+    android:permissionGroup="android.permission-group.LOCATION"
+    android:protectionLevel="signature" />
+  <!-- Permission to read track data -->
+  <permission
+    android:description="@string/permission_read_description"
+    android:label="@string/permission_read_label"
+    android:name="com.google.android.apps.mytracks.READ_TRACK_DATA"
+    android:permissionGroup="android.permission-group.LOCATION"
+    android:protectionLevel="dangerous" />
+  <!-- Permission to receive track start/end broadcasts -->
+  <permission
+    android:description="@string/permission_notification_description"
+    android:label="@string/permission_notification_label"
+    android:name="com.google.android.apps.mytracks.TRACK_NOTIFICATIONS"
+    android:permissionGroup="android.permission-group.LOCATION"
+    android:protectionLevel="dangerous" />
+  <!-- Permission to write track data, either directly or through service calls -->
+  <permission
+    android:description="@string/permission_write_description"
+    android:label="@string/permission_write_label"
+    android:name="com.google.android.apps.mytracks.WRITE_TRACK_DATA"
+    android:permissionGroup="android.permission-group.LOCATION"
+    android:protectionLevel="dangerous" />
+
+  <supports-screens
+    android:anyDensity="true"
+    android:largeScreens="true"
+    android:normalScreens="true"
+    android:smallScreens="true"
+    android:xlargeScreens="true" />
+
+  <!-- Required features -->
+  <uses-feature
+    android:name="android.hardware.location"
+    android:required="true" />
+  <uses-feature
+    android:name="android.hardware.location.gps"
+    android:required="true" />
+
+  <!-- Optional features -->
+  <uses-feature
+    android:name="android.hardware.bluetooth"
+    android:required="false" />
+  <uses-feature
+    android:name="android.hardware.faketouch"
+    android:required="false" />
+  <uses-feature
+    android:name="android.hardware.location.network"
+    android:required="false" />
+  <uses-feature
+    android:name="android.hardware.sensor.compass"
+    android:required="false" />
+  <uses-feature
+    android:name="android.hardware.telephony"
+    android:required="false" />
+  <uses-feature
+    android:name="android.hardware.telephony.gsm"
+    android:required="false" />
+  <uses-feature
+    android:name="android.hardware.touchscreen"
+    android:required="false" />
+  <uses-feature
+    android:name="android.hardware.touchscreen.multitouch"
+    android:required="false" />
+
+  <!-- Permission to initialize services -->
+  <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED" />
+
+  <!-- Permissions to record locations -->
+  <uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION" />
+  <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" />
+  <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
+  <uses-permission android:name="android.permission.WAKE_LOCK" />
+
+  <!-- Permissions to access sensors -->
+  <uses-permission android:name="com.dsi.ant.permission.ANT" />
+  <uses-permission android:name="com.dsi.ant.permission.ANT_ADMIN" />
+  <uses-permission android:name="android.permission.BLUETOOTH" />
+  <uses-permission android:name="android.permission.BLUETOOTH_ADMIN" />
+
+  <!-- Permissions to upload tracks -->
+  <uses-permission android:name="android.permission.GET_ACCOUNTS" />
+  <uses-permission android:name="android.permission.INTERNET" />
+  <uses-permission android:name="android.permission.MANAGE_ACCOUNTS" />
+  <uses-permission android:name="android.permission.USE_CREDENTIALS" />
+  <uses-permission android:name="com.google.android.googleapps.permission.GOOGLE_AUTH" />
+  <uses-permission android:name="com.google.android.googleapps.permission.GOOGLE_AUTH.fusiontables" />
+  <uses-permission android:name="com.google.android.googleapps.permission.GOOGLE_AUTH.local" />
+  <uses-permission android:name="com.google.android.googleapps.permission.GOOGLE_AUTH.wise" />
+  <uses-permission android:name="com.google.android.googleapps.permission.GOOGLE_AUTH.writely" />
+  <uses-permission android:name="com.google.android.providers.gsf.permission.READ_GSERVICES" />
+
+  <!-- Permission to read phone state so voice announcement will not interrupt ongoing calls -->
+  <uses-permission android:name="android.permission.READ_PHONE_STATE" />
+
+  <!-- Permission to write to SD card -->
+  <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
+
+  <!-- Permissions to access My Tracks data -->
+  <uses-permission android:name="com.google.android.apps.mytracks.MYTRACKS_NOTIFICATIONS" />
+  <uses-permission android:name="com.google.android.apps.mytracks.READ_TRACK_DATA" />
+  <uses-permission android:name="com.google.android.apps.mytracks.WRITE_TRACK_DATA" />
+
+  <uses-sdk android:minSdkVersion="7" />
+
 </manifest>
\ No newline at end of file
diff --git a/MyTracksLib/AndroidManifest.xml b/MyTracksLib/AndroidManifest.xml
index c56a8cc5c..8952a82a8 100644
--- a/MyTracksLib/AndroidManifest.xml
+++ b/MyTracksLib/AndroidManifest.xml
@@ -16,7 +16,8 @@ limitations under the License.
 -->
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
   android:versionCode="1"
-  android:versionName="1.0" >
+  android:versionName="1.0"
+  package="com.google.android.apps.mytracks.lib" >
 
   <!--
      THIS IS A LIBRARY PROJECT.