diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 473c7564..f9a69734 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -1,8 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-      package="org.torproject.android" android:versionName="0.2.2.22-orbot-alpha-1.0.5-dev-debug" android:versionCode="11">
+      package="org.torproject.android" android:versionName="0.2.2.22-orbot-alpha-1.0.5.20110503a-dev" android:versionCode="11">
        
        <uses-permission android:name="android.permission.INTERNET" />
+ 		<uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED"/>
  
     <application android:icon="@drawable/icon" android:label="@string/app_name" android:debuggable="false">
       
@@ -32,7 +33,10 @@
         <activity android:name=".AppManager"  android:label="@string/app_name"/>
         <activity android:name=".WizardActivity"  android:label="@string/app_name"/>
       
-    	<service android:name=".service.TorService" android:process=":remote">
+    	<service android:enabled="true"
+    		android:name=".service.TorService" 
+    		android:exported="false"
+    		>
 	            <intent-filter>
 	                <action android:name="org.torproject.android.service.ITorService" />
 	              	<action android:name="org.torproject.android.service.TOR_SERVICE" />
@@ -40,6 +44,13 @@
     	</service>
     	
     	
+    	<receiver android:name=".OnBootReceiver">
+			<intent-filter>
+			<action
+			android:name="android.intent.action.BOOT_COMPLETED" />
+			<category android:name="android.intent.category.HOME" />
+			</intent-filter>
+		</receiver>
     	
     </application>
     
diff --git a/AndroidManifest.xml.production b/AndroidManifest.xml.production
index cfafd2d3..2b8233a3 100644
--- a/AndroidManifest.xml.production
+++ b/AndroidManifest.xml.production
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-      package="org.torproject.android" android:versionName="0.2.2.14-orbot-alpha-1.0.3" android:versionCode="9">
+      package="org.torproject.android" android:versionName="0.2.2.22-orbot-alpha-1.0.5.20110416a-dev" android:versionCode="11">
        
        <uses-permission android:name="android.permission.INTERNET" />
-
+ 		<uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED"/>
  
-    <application android:icon="@drawable/icon" android:label="@string/app_name" android:debuggable="false">
+    <application android:icon="@drawable/icon" android:label="@string/app_name" android:debuggable="true">
       
         <activity android:name=".Orbot"
                   android:theme="@android:style/Theme.NoTitleBar">
@@ -33,7 +33,10 @@
         <activity android:name=".AppManager"  android:label="@string/app_name"/>
         <activity android:name=".WizardActivity"  android:label="@string/app_name"/>
       
-    	<service android:name=".service.TorService" android:process=":remote">
+    	<service android:enabled="true"
+    		android:name=".service.TorService" 
+    		android:exported="false"
+    		>
 	            <intent-filter>
 	                <action android:name="org.torproject.android.service.ITorService" />
 	              	<action android:name="org.torproject.android.service.TOR_SERVICE" />
@@ -41,6 +44,13 @@
     	</service>
     	
     	
+    	<receiver android:name=".OnBootReceiver">
+			<intent-filter>
+			<action
+			android:name="android.intent.action.BOOT_COMPLETED" />
+			<category android:name="android.intent.category.HOME" />
+			</intent-filter>
+		</receiver>
     	
     </application>
     
diff --git a/CHANGELOG b/CHANGELOG
index 14e36262..a4a02f17 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,6 +1,7 @@
 NOTE: Specific #s below correspond to Trac tickets logged and maintained at https://trac.torproject.org/projects/tor/
 
 1.0.5
+- Added new toolbar notifications and alerts for displaying notifications and Tor messages
 - Removed unused Socks client code from android.net package
 - Updated wizard to show link to Gibberbot (formerly OTRchat) chat app
 - Bundled iptables 1.4.7 for ARM instead of relying on installed version
diff --git a/LICENSE b/LICENSE
index e505504a..dd7b4f32 100644
--- a/LICENSE
+++ b/LICENSE
@@ -1,7 +1,8 @@
 This file contains the license for Orbot, a free software project to
 provide anonymity on the Internet from a Google Android smartphone.
 
-It also lists the licenses for other components used by Orbot.
+It also lists the licenses for other components used by Orbot, including 
+Tor, Privoxy, and iptables.
 
 For more information about Orbot, see https://guardianproject.info/apps/orbot
 
@@ -146,3 +147,14 @@ http://ip-to-country.webhosting.info."
 See the src/config/geoip file in particular.
 ===============================================================================
 
+===============================================================================
+Orbot also uses iptables from the Netfilter.org project
+
+netfilter/iptables is - like all of the Linux Kernel - Free Software (sometimes
+referred to as Open Source Software), distributed under the terms of the GNU GPLv2
+only. Please, note that some source code files might differ, and in that case it
+is explicitely stated in the header of every file.
+
+The GPL also contains some obligations. If you distribute netfilter/iptables code
+in binary form, you have to offer the source code, too.
+===============================================================================