diff --git a/backends/platform/android/android.mk b/backends/platform/android/android.mk
index 63d194fdc1f..2e8fd621526 100644
--- a/backends/platform/android/android.mk
+++ b/backends/platform/android/android.mk
@@ -63,7 +63,7 @@ PATH_BUILD_CLASSES_PLUGIN_TOP = $(PATH_BUILD)/classes.plugin
 PATH_STAGE_PREFIX = build.stage
 PATH_STAGE_MAIN = $(PATH_STAGE_PREFIX).main
 
-PATH_REL = org/inodes/gus/scummvm
+PATH_REL = org/scummvm/scummvm
 PATH_SRC_TOP = $(srcdir)/backends/platform/android
 PATH_SRC = $(PATH_SRC_TOP)/$(PATH_REL)
 
@@ -172,13 +172,13 @@ androidrelease: $(addprefix release/, $(APK_MAIN) $(APK_PLUGINS))
 
 androidtestmain: $(APK_MAIN)
 	$(ADB) install -r $(APK_MAIN)
-	$(ADB) shell am start -a android.intent.action.MAIN -c android.intent.category.LAUNCHER -n org.inodes.gus.scummvm/.Unpacker
+	$(ADB) shell am start -a android.intent.action.MAIN -c android.intent.category.LAUNCHER -n org.scummvm.scummvm/.Unpacker
 
 androidtest: $(APK_MAIN) $(APK_PLUGINS)
 	@set -e; for apk in $^; do \
 		$(ADB) install -r $$apk; \
 	done
-	$(ADB) shell am start -a android.intent.action.MAIN -c android.intent.category.LAUNCHER -n org.inodes.gus.scummvm/.Unpacker
+	$(ADB) shell am start -a android.intent.action.MAIN -c android.intent.category.LAUNCHER -n org.scummvm.scummvm/.Unpacker
 
 # used by buildbot!
 androiddistdebug: all
diff --git a/backends/platform/android/jni.cpp b/backends/platform/android/jni.cpp
index b44a5855281..a7ebb876518 100644
--- a/backends/platform/android/jni.cpp
+++ b/backends/platform/android/jni.cpp
@@ -125,7 +125,7 @@ jint JNI::onLoad(JavaVM *vm) {
 	if (_vm->GetEnv((void **)&env, JNI_VERSION_1_2))
 		return JNI_ERR;
 
-	jclass cls = env->FindClass("org/inodes/gus/scummvm/ScummVM");
+	jclass cls = env->FindClass("org/scummvm/scummvm/ScummVM");
 	if (cls == 0)
 		return JNI_ERR;
 
diff --git a/backends/platform/android/org/inodes/gus/scummvm/EditableSurfaceView.java b/backends/platform/android/org/scummvm/scummvm/EditableSurfaceView.java
similarity index 98%
rename from backends/platform/android/org/inodes/gus/scummvm/EditableSurfaceView.java
rename to backends/platform/android/org/scummvm/scummvm/EditableSurfaceView.java
index 3aef14b8516..b593fc6abf4 100644
--- a/backends/platform/android/org/inodes/gus/scummvm/EditableSurfaceView.java
+++ b/backends/platform/android/org/scummvm/scummvm/EditableSurfaceView.java
@@ -1,4 +1,4 @@
-package org.inodes.gus.scummvm;
+package org.scummvm.scummvm;
 
 import android.content.Context;
 import android.text.InputType;
diff --git a/backends/platform/android/org/inodes/gus/scummvm/PluginProvider.java b/backends/platform/android/org/scummvm/scummvm/PluginProvider.java
similarity index 94%
rename from backends/platform/android/org/inodes/gus/scummvm/PluginProvider.java
rename to backends/platform/android/org/scummvm/scummvm/PluginProvider.java
index d90b7b2c689..0c43529f83f 100644
--- a/backends/platform/android/org/inodes/gus/scummvm/PluginProvider.java
+++ b/backends/platform/android/org/scummvm/scummvm/PluginProvider.java
@@ -1,4 +1,4 @@
-package org.inodes.gus.scummvm;
+package org.scummvm.scummvm;
 
 import android.content.BroadcastReceiver;
 import android.content.ComponentName;
@@ -16,7 +16,7 @@ public class PluginProvider extends BroadcastReceiver {
 	private final static String LOG_TAG = "ScummVM";
 
 	public final static String META_UNPACK_LIB =
-		"org.inodes.gus.scummvm.meta.UNPACK_LIB";
+		"org.scummvm.scummvm.meta.UNPACK_LIB";
 
 	public void onReceive(Context context, Intent intent) {
 		if (!intent.getAction().equals(ScummVMApplication.ACTION_PLUGIN_QUERY))
diff --git a/backends/platform/android/org/inodes/gus/scummvm/ScummVM.java b/backends/platform/android/org/scummvm/scummvm/ScummVM.java
similarity index 99%
rename from backends/platform/android/org/inodes/gus/scummvm/ScummVM.java
rename to backends/platform/android/org/scummvm/scummvm/ScummVM.java
index 246a02c9beb..3a25b54eeb7 100644
--- a/backends/platform/android/org/inodes/gus/scummvm/ScummVM.java
+++ b/backends/platform/android/org/scummvm/scummvm/ScummVM.java
@@ -1,4 +1,4 @@
-package org.inodes.gus.scummvm;
+package org.scummvm.scummvm;
 
 import android.util.Log;
 import android.content.res.AssetManager;
diff --git a/backends/platform/android/org/inodes/gus/scummvm/ScummVMActivity.java b/backends/platform/android/org/scummvm/scummvm/ScummVMActivity.java
similarity index 99%
rename from backends/platform/android/org/inodes/gus/scummvm/ScummVMActivity.java
rename to backends/platform/android/org/scummvm/scummvm/ScummVMActivity.java
index ce4e0163225..a41e843323d 100644
--- a/backends/platform/android/org/inodes/gus/scummvm/ScummVMActivity.java
+++ b/backends/platform/android/org/scummvm/scummvm/ScummVMActivity.java
@@ -1,4 +1,4 @@
-package org.inodes.gus.scummvm;
+package org.scummvm.scummvm;
 
 import android.app.Activity;
 import android.app.AlertDialog;
diff --git a/backends/platform/android/org/inodes/gus/scummvm/ScummVMApplication.java b/backends/platform/android/org/scummvm/scummvm/ScummVMApplication.java
similarity index 73%
rename from backends/platform/android/org/inodes/gus/scummvm/ScummVMApplication.java
rename to backends/platform/android/org/scummvm/scummvm/ScummVMApplication.java
index 8ab7d1a0848..9241cba9182 100644
--- a/backends/platform/android/org/inodes/gus/scummvm/ScummVMApplication.java
+++ b/backends/platform/android/org/scummvm/scummvm/ScummVMApplication.java
@@ -1,12 +1,12 @@
-package org.inodes.gus.scummvm;
+package org.scummvm.scummvm;
 
 import android.app.Application;
 
 import java.io.File;
 
 public class ScummVMApplication extends Application {
-	public final static String ACTION_PLUGIN_QUERY = "org.inodes.gus.scummvm.action.PLUGIN_QUERY";
-	public final static String EXTRA_UNPACK_LIBS = "org.inodes.gus.scummvm.extra.UNPACK_LIBS";
+	public final static String ACTION_PLUGIN_QUERY = "org.scummvm.scummvm.action.PLUGIN_QUERY";
+	public final static String EXTRA_UNPACK_LIBS = "org.scummvm.scummvm.extra.UNPACK_LIBS";
 
 	private static File _cache_dir;
 
diff --git a/backends/platform/android/org/inodes/gus/scummvm/ScummVMEvents.java b/backends/platform/android/org/scummvm/scummvm/ScummVMEvents.java
similarity index 99%
rename from backends/platform/android/org/inodes/gus/scummvm/ScummVMEvents.java
rename to backends/platform/android/org/scummvm/scummvm/ScummVMEvents.java
index 175ff0b677e..86227b93522 100644
--- a/backends/platform/android/org/inodes/gus/scummvm/ScummVMEvents.java
+++ b/backends/platform/android/org/scummvm/scummvm/ScummVMEvents.java
@@ -1,4 +1,4 @@
-package org.inodes.gus.scummvm;
+package org.scummvm.scummvm;
 
 import android.os.Handler;
 import android.os.Message;
diff --git a/backends/platform/android/org/inodes/gus/scummvm/Unpacker.java b/backends/platform/android/org/scummvm/scummvm/Unpacker.java
similarity index 99%
rename from backends/platform/android/org/inodes/gus/scummvm/Unpacker.java
rename to backends/platform/android/org/scummvm/scummvm/Unpacker.java
index 6cc7f8eadbe..4564d966229 100644
--- a/backends/platform/android/org/inodes/gus/scummvm/Unpacker.java
+++ b/backends/platform/android/org/scummvm/scummvm/Unpacker.java
@@ -1,4 +1,4 @@
-package org.inodes.gus.scummvm;
+package org.scummvm.scummvm;
 
 import android.app.Activity;
 import android.app.AlertDialog;
@@ -38,7 +38,7 @@ public class Unpacker extends Activity {
 	// TODO don't hardcode this
 	private final static boolean PLUGINS_ENABLED = false;
 	private final static String META_NEXT_ACTIVITY =
-		"org.inodes.gus.unpacker.nextActivity";
+		"org.scummvm.unpacker.nextActivity";
 	private ProgressBar mProgress;
 	private File mUnpackDest;  // location to unpack into
 	private AsyncTask<String, Integer, Void> mUnpacker;
diff --git a/dists/android/AndroidManifest.xml b/dists/android/AndroidManifest.xml
index a25048fe28f..e7778fdf617 100644
--- a/dists/android/AndroidManifest.xml
+++ b/dists/android/AndroidManifest.xml
@@ -2,11 +2,11 @@
 <!-- NB: android:versionCode needs to be bumped for formal releases -->
 
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-		package="org.inodes.gus.scummvm"
+		package="org.scummvm.scummvm"
 		android:versionCode="@ANDROID_VERSIONCODE@"
 		android:versionName="1.5.0git"
 		android:installLocation="preferExternal"
-		android:sharedUserId="org.inodes.gus.scummvm">
+		android:sharedUserId="org.scummvm.scummvm">
 
 	<!-- This version works on Android 1.5 (SDK 3) and newer, but we
 			want Android 2.2 (SDK 8) defaults and features. -->
@@ -31,8 +31,8 @@
 				android:theme="@android:style/Theme.NoTitleBar.Fullscreen"
 				android:screenOrientation="landscape"
 				android:configChanges="orientation|keyboardHidden">
-			<meta-data android:name="org.inodes.gus.unpacker.nextActivity"
-				android:value="org.inodes.gus.scummvm/.ScummVMActivity"/>
+			<meta-data android:name="org.scummvm.unpacker.nextActivity"
+				android:value="org.scummvm.scummvm/.ScummVMActivity"/>
 			<intent-filter>
 				<action android:name="android.intent.action.MAIN"/>
 				<category android:name="android.intent.category.LAUNCHER"/>
@@ -40,7 +40,7 @@
 		</activity>
 	</application>
 
-	<permission android:name="org.inodes.gus.scummvm.permission.SCUMMVM_PLUGIN"
+	<permission android:name="org.scummvm.scummvm.permission.SCUMMVM_PLUGIN"
 		android:label="@string/scummvm_perm_plugin_label"
 		android:description="@string/scummvm_perm_plugin_desc"
 		android:protectionLevel="signature"/>
diff --git a/dists/android/AndroidManifest.xml.in b/dists/android/AndroidManifest.xml.in
index 32444a03f06..8f7887eaf50 100644
--- a/dists/android/AndroidManifest.xml.in
+++ b/dists/android/AndroidManifest.xml.in
@@ -2,11 +2,11 @@
 <!-- NB: android:versionCode needs to be bumped for formal releases -->
 
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-		package="org.inodes.gus.scummvm"
+		package="org.scummvm.scummvm"
 		android:versionCode="@ANDROID_VERSIONCODE@"
 		android:versionName="@VERSION@"
 		android:installLocation="preferExternal"
-		android:sharedUserId="org.inodes.gus.scummvm">
+		android:sharedUserId="org.scummvm.scummvm">
 
 	<!-- This version works on Android 1.5 (SDK 3) and newer, but we
 			want Android 2.2 (SDK 8) defaults and features. -->
@@ -31,8 +31,8 @@
 				android:theme="@android:style/Theme.NoTitleBar.Fullscreen"
 				android:screenOrientation="landscape"
 				android:configChanges="orientation|keyboardHidden">
-			<meta-data android:name="org.inodes.gus.unpacker.nextActivity"
-				android:value="org.inodes.gus.scummvm/.ScummVMActivity"/>
+			<meta-data android:name="org.scummvm.unpacker.nextActivity"
+				android:value="org.scummvm.scummvm/.ScummVMActivity"/>
 			<intent-filter>
 				<action android:name="android.intent.action.MAIN"/>
 				<category android:name="android.intent.category.LAUNCHER"/>
@@ -40,7 +40,7 @@
 		</activity>
 	</application>
 
-	<permission android:name="org.inodes.gus.scummvm.permission.SCUMMVM_PLUGIN"
+	<permission android:name="org.scummvm.scummvm.permission.SCUMMVM_PLUGIN"
 		android:label="@string/scummvm_perm_plugin_label"
 		android:description="@string/scummvm_perm_plugin_desc"
 		android:protectionLevel="signature"/>
diff --git a/dists/android/plugin-manifest.xml b/dists/android/plugin-manifest.xml
index 728beb1de35..51b39be3b16 100644
--- a/dists/android/plugin-manifest.xml
+++ b/dists/android/plugin-manifest.xml
@@ -1,29 +1,29 @@
 <?xml version="1.0" encoding="utf-8"?>
 
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-		package="org.inodes.gus.scummvm.plugin.@PLUGIN_NAME@"
+		package="org.scummvm.scummvm.plugin.@PLUGIN_NAME@"
 		android:versionCode="@PLUGIN_VERSION_CODE@"
 		android:versionName="1.5.0git"
 		android:installLocation="preferExternal"
-		android:sharedUserId="org.inodes.gus.scummvm">
+		android:sharedUserId="org.scummvm.scummvm">
 
 	<uses-sdk android:minSdkVersion="3" android:targetSdkVersion="8" />
 
 	<application android:label="@string/app_name"
 			android:description="@string/app_desc"
 			android:icon="@drawable/scummvm">
-		<receiver android:name="org.inodes.gus.scummvm.PluginProvider"
-				android:process="org.inodes.gus.scummvm">
+		<receiver android:name="org.scummvm.scummvm.PluginProvider"
+				android:process="org.scummvm.scummvm">
 			<intent-filter>
-				<action android:name="org.inodes.gus.scummvm.action.PLUGIN_QUERY"/>
+				<action android:name="org.scummvm.scummvm.action.PLUGIN_QUERY"/>
 				<category android:name="android.intent.category.INFO"/>
 			</intent-filter>
-			<meta-data android:name="org.inodes.gus.scummvm.meta.UNPACK_LIB"
+			<meta-data android:name="org.scummvm.scummvm.meta.UNPACK_LIB"
 					android:value="mylib/armeabi/lib@PLUGIN_NAME@.so" />
 		</receiver>
 	</application>
 
-	<uses-permission android:name="org.inodes.gus.scummvm.permission.SCUMMVM_PLUGIN"/>
+	<uses-permission android:name="org.scummvm.scummvm.permission.SCUMMVM_PLUGIN"/>
 	<uses-configuration android:reqFiveWayNav="true"
 			android:reqKeyboardType="qwerty"/>
 
diff --git a/dists/android/plugin-manifest.xml.in b/dists/android/plugin-manifest.xml.in
index ab0a63a0cf4..4b429097aec 100644
--- a/dists/android/plugin-manifest.xml.in
+++ b/dists/android/plugin-manifest.xml.in
@@ -1,29 +1,29 @@
 <?xml version="1.0" encoding="utf-8"?>
 
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-		package="org.inodes.gus.scummvm.plugin.@PLUGIN_NAME@"
+		package="org.scummvm.scummvm.plugin.@PLUGIN_NAME@"
 		android:versionCode="@PLUGIN_VERSION_CODE@"
 		android:versionName="@VERSION@"
 		android:installLocation="preferExternal"
-		android:sharedUserId="org.inodes.gus.scummvm">
+		android:sharedUserId="org.scummvm.scummvm">
 
 	<uses-sdk android:minSdkVersion="3" android:targetSdkVersion="8" />
 
 	<application android:label="@string/app_name"
 			android:description="@string/app_desc"
 			android:icon="@drawable/scummvm">
-		<receiver android:name="org.inodes.gus.scummvm.PluginProvider"
-				android:process="org.inodes.gus.scummvm">
+		<receiver android:name="org.scummvm.scummvm.PluginProvider"
+				android:process="org.scummvm.scummvm">
 			<intent-filter>
-				<action android:name="org.inodes.gus.scummvm.action.PLUGIN_QUERY"/>
+				<action android:name="org.scummvm.scummvm.action.PLUGIN_QUERY"/>
 				<category android:name="android.intent.category.INFO"/>
 			</intent-filter>
-			<meta-data android:name="org.inodes.gus.scummvm.meta.UNPACK_LIB"
+			<meta-data android:name="org.scummvm.scummvm.meta.UNPACK_LIB"
 					android:value="mylib/armeabi/lib@PLUGIN_NAME@.so" />
 		</receiver>
 	</application>
 
-	<uses-permission android:name="org.inodes.gus.scummvm.permission.SCUMMVM_PLUGIN"/>
+	<uses-permission android:name="org.scummvm.scummvm.permission.SCUMMVM_PLUGIN"/>
 	<uses-configuration android:reqFiveWayNav="true"
 			android:reqKeyboardType="qwerty"/>
 
diff --git a/dists/android/res/layout/main.xml b/dists/android/res/layout/main.xml
index 7b633c416d0..8b0d515d62b 100644
--- a/dists/android/res/layout/main.xml
+++ b/dists/android/res/layout/main.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 
-<org.inodes.gus.scummvm.EditableSurfaceView
+<org.scummvm.scummvm.EditableSurfaceView
 	xmlns:android="http://schemas.android.com/apk/res/android"
 	android:id="@+id/main_surface"
 	android:layout_width="fill_parent"