diff --git a/Android.mk b/Android.mk
new file mode 100644
index 000000000..68cfcf126
--- /dev/null
+++ b/Android.mk
@@ -0,0 +1,8 @@
+LOCAL_PATH := $(call my-dir)
+include $(CLEAR_VARS)
+
+LOCAL_PACKAGE_NAME := FDroid
+LOCAL_SRC_FILES := $(call all-java-files-under,src)
+
+include $(BUILD_PACKAGE)
+
diff --git a/res/layout/about.xml b/res/layout/about.xml
index bd486b308..d8403f176 100644
--- a/res/layout/about.xml
+++ b/res/layout/about.xml
@@ -23,7 +23,7 @@
 			android:layout_width="wrap_content" android:layout_height="wrap_content"
 			android:textSize="16px" android:textColor="#ffffff" />
 
-		<TextView android:id="@+id/sitec" android:text="http://f-droid.org"
+		<TextView android:id="@+id/sitec" android:text="@string/about_sitec"
 			android:layout_width="wrap_content" android:layout_height="wrap_content" />
 
 	</LinearLayout>
@@ -36,13 +36,13 @@
 			android:layout_width="wrap_content" android:layout_height="wrap_content"
 			android:textSize="16px" android:textColor="#ffffff" />
 
-		<TextView android:id="@+id/mailc" android:text="admin@f-droid.org"
+		<TextView android:id="@+id/mailc" android:text="@string/about_mailc"
 			android:autoLink="email" android:layout_width="wrap_content"
 			android:layout_height="wrap_content" />
 
 	</LinearLayout>
 
-	<TextView android:id="@+id/not" android:text=" "
+	<TextView android:id="@+id/not" android:text="@string/about_not"
 		android:layout_width="wrap_content" android:layout_height="wrap_content" />
 
 	<TextView android:text="@string/about_desc"
diff --git a/res/layout/addrepo.xml b/res/layout/addrepo.xml
index 3cdd07869..0f0845155 100644
--- a/res/layout/addrepo.xml
+++ b/res/layout/addrepo.xml
@@ -15,7 +15,7 @@
         android:layout_width="wrap_content"
         android:ems="20"
         android:layout_height="wrap_content"
-        android:text="http://"/>
+        android:text="@string/repo_add_http"/>
 </LinearLayout>
 <!--
  * Copyright (C) 2009  Roberto Jacinto
@@ -34,4 +34,4 @@
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
--->
\ No newline at end of file
+-->
diff --git a/res/values/strings.xml b/res/values/strings.xml
index f0a92c8d5..6ff4d4a56 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -25,10 +25,12 @@
 		GNU GPLv2
 		license.</string>
 	<string name="about_site">Website: </string>
+	<string name="about_sitec">http://f-droid.org</string>
 	<string name="about_mail">Email: </string>
+	<string name="about_mailc">admin@f-droid.org</string>
 	<string name="about_version">Version: </string>
 	<string name="about_website">Website</string>
-
+	<string name="about_not"> </string>
 
 	<string name="no_repo">You don\'t have any repositories configured!\n\nA
 		repository is a source of applications. To add one, press the MENU
@@ -67,6 +69,7 @@
 	<string name="download_server">Getting application from</string>
 
 	<string name="repo_add_url">Repository address</string>
+	<string name="repo_add_http">http://</string>
 
 	<string name="isinst">Installed: </string>