diff --git a/pythonforandroid/bootstraps/sdl2/build/src/main/java/org/kivy/android/PythonActivity.java b/pythonforandroid/bootstraps/sdl2/build/src/main/java/org/kivy/android/PythonActivity.java
index 33d0855ef3..1ff86bc976 100644
--- a/pythonforandroid/bootstraps/sdl2/build/src/main/java/org/kivy/android/PythonActivity.java
+++ b/pythonforandroid/bootstraps/sdl2/build/src/main/java/org/kivy/android/PythonActivity.java
@@ -151,12 +151,18 @@ protected void onPostExecute(String result) {
                 File path = new File(getIntent().getData().getSchemeSpecificPart());
 
                 Project p = Project.scanDirectory(path);
+                String custom_orientation = PythonActivity.mActivity.getStringExtra("orientation");
+
                 String entry_point = getEntryPoint(p.dir);
                 SDLActivity.nativeSetenv("ANDROID_ENTRYPOINT", p.dir + "/" + entry_point);
                 SDLActivity.nativeSetenv("ANDROID_ARGUMENT", p.dir);
                 SDLActivity.nativeSetenv("ANDROID_APP_PATH", p.dir);
 
-                if (p != null) {
+                if (custom_orientation == "landscape")
+                    setRequestedOrientation(ActivityInfo.SCREEN_ORIENTATION_LANDSCAPE);
+                else if (custom_orientation == "portrait")
+                    setRequestedOrientation(ActivityInfo.SCREEN_ORIENTATION_PORTRAIT);
+                else if (p != null) {
                     if (p.landscape) {
                         setRequestedOrientation(ActivityInfo.SCREEN_ORIENTATION_LANDSCAPE);
                     } else {
@@ -499,9 +505,15 @@ public String getEntryPoint(String search_dir) {
          * have a compiled version or not.
         */
         List<String> entryPoints = new ArrayList<String>();
-        entryPoints.add("main.pyo");  // python 2 compiled files
-        entryPoints.add("main.pyc");  // python 3 compiled files
-		for (String value : entryPoints) {
+        String extra = PythonActivity.mActivity.getStringExtra("entrypoint");
+        if (extra != "")
+            entryPoints.add(extra);  // custom entrypoint
+
+	else {
+	    entryPoints.add("main.pyo");  // python 2 compiled files
+	    entryPoints.add("main.pyc");  // python 3 compiled files
+	}
+        for (String value : entryPoints) {
             File mainFile = new File(search_dir + "/" + value);
             if (mainFile.exists()) {
                 return value;