diff --git a/pkg/apple/RetroArch_iOS11.xcodeproj/project.pbxproj b/pkg/apple/RetroArch_iOS11.xcodeproj/project.pbxproj
index 806f927ba3..5c0b588200 100644
--- a/pkg/apple/RetroArch_iOS11.xcodeproj/project.pbxproj
+++ b/pkg/apple/RetroArch_iOS11.xcodeproj/project.pbxproj
@@ -223,7 +223,7 @@
 				TargetAttributes = {
 					9204BE091D319EF300BD49DB = {
 						DevelopmentTeam = UK699V5ZS8;
-						DevelopmentTeamName = "Yoshinobu Sugawara";
+						DevelopmentTeamName = "RetroArch";
 					};
 				};
 			};
@@ -373,6 +373,7 @@
 					"-DHAVE_MFI",
 					"-DHAVE_BTSTACK",
 					"-DHAVE_AVFOUNDATION",
+					"-DHAVE_KEYMAPPER",
 				);
 				PRODUCT_BUNDLE_IDENTIFIER = com.libretro.RetroArchiOS11;
 				PRODUCT_NAME = "$(TARGET_NAME)";
@@ -459,6 +460,7 @@
 					"-DHAVE_MFI",
 					"-DHAVE_BTSTACK",
 					"-DHAVE_AVFOUNDATION",
+					"-DHAVE_KEYMAPPER",
 				);
 				"OTHER_CFLAGS[arch=*]" = (
 					"-DNS_BLOCK_ASSERTIONS=1",
@@ -511,6 +513,7 @@
 					"-DHAVE_MFI",
 					"-DHAVE_BTSTACK",
 					"-DHAVE_AVFOUNDATION",
+					"-DHAVE_KEYMAPPER",
 				);
 				PRODUCT_BUNDLE_IDENTIFIER = com.libretro.RetroArchiOS11;
 				PRODUCT_NAME = "$(TARGET_NAME)";
diff --git a/ui/drivers/ui_cocoatouch.m b/ui/drivers/ui_cocoatouch.m
index 9917805e70..481ff7f827 100644
--- a/ui/drivers/ui_cocoatouch.m
+++ b/ui/drivers/ui_cocoatouch.m
@@ -337,6 +337,14 @@ enum
    return (RetroArch_iOS*)[[UIApplication sharedApplication] delegate];
 }
 
+-(NSString*)documentsDirectory {
+    if ( _documentsDirectory == nil ) {
+        NSArray *paths = NSSearchPathForDirectoriesInDomains(NSDocumentDirectory, NSUserDomainMask, YES);
+        _documentsDirectory = paths.firstObject;
+    }
+    return _documentsDirectory;
+}
+
 - (void)applicationDidFinishLaunching:(UIApplication *)application
 {
    char arguments[]   = "retroarch";
@@ -377,6 +385,7 @@ enum
     extern bool apple_gamecontroller_joypad_init(void *data);
     apple_gamecontroller_joypad_init(NULL);
 #endif
+
 }
 
 - (void)applicationDidEnterBackground:(UIApplication *)application