diff --git a/dist/info/ffmpeg_libretro.info b/dist/info/ffmpeg_libretro.info
index bcd51ac1..b78748ac 100644
--- a/dist/info/ffmpeg_libretro.info
+++ b/dist/info/ffmpeg_libretro.info
@@ -1,5 +1,5 @@
 display_name = "FFmpeg"
-supported_extensions = "mkv|avi|f4v|f4f|3gp|ogm|flv|mp4|mp3|flac|ogg|m4a"
+supported_extensions = "mkv|avi|f4v|f4f|3gp|ogm|flv|mp4|mp3|flac|ogg|m4a|webm"
 corename = "FFmpeg"
 license = "LGPLv2, GPLv2"
 permissions = ""
diff --git a/libretro-build-android-mk.sh b/libretro-build-android-mk.sh
index 5cdbf920..a4388e45 100755
--- a/libretro-build-android-mk.sh
+++ b/libretro-build-android-mk.sh
@@ -214,20 +214,20 @@ build_libretro_vba_next()
    fi
 }
 
-build_libretro_fceu()
+build_libretro_fceumm()
 {
    cd $BASE_DIR
-   if [ -d "libretro-fceu" ]; then
-      echo "=== Building FCEU ==="
-      cd libretro-fceu
-      cd fceumm-code/src/drivers/libretro/jni
+   if [ -d "libretro-fceumm" ]; then
+      echo "=== Building FCEUmm ==="
+      cd libretro-fceumm
+      cd src/drivers/libretro/jni
       ndk-build clean APP_ABI="armeabi-v7a mips x86"
       ndk-build -j$JOBS APP_ABI="armeabi-v7a mips x86"
       cp ../libs/armeabi-v7a/libretro.${FORMAT_EXT} $RARCH_DIST_DIR/armeabi-v7a/fceumm_libretro${FORMAT}.${FORMAT_EXT}
       cp ../libs/mips/libretro.${FORMAT_EXT} $RARCH_DIST_DIR/mips/fceumm_libretro${FORMAT}.${FORMAT_EXT}
       cp ../libs/x86/libretro.${FORMAT_EXT} $RARCH_DIST_DIR/x86/fceumm_libretro${FORMAT}.${FORMAT_EXT}
    else
-      echo "FCEU not fetched, skipping ..."
+      echo "FCEUmm not fetched, skipping ..."
    fi
 }
 
@@ -607,7 +607,7 @@ else
    build_libretro_vbam
    build_libretro_vba_next
    #build_libretro_bnes
-   build_libretro_fceu
+   build_libretro_fceumm
    build_libretro_gambatte
    build_libretro_meteor
    build_libretro_nx
diff --git a/libretro-build-common-xdk.sh b/libretro-build-common-xdk.sh
index 6d7cc443..fed1aaae 100644
--- a/libretro-build-common-xdk.sh
+++ b/libretro-build-common-xdk.sh
@@ -150,17 +150,17 @@ build_libretro_mame078() {
    fi
 }
 
-build_libretro_fceu()
+build_libretro_fceumm()
 {
    cd $BASE_DIR
-   if [ -d "libretro-fceu" ]; then
-      echo "=== Building FCEU ==="
-      cd libretro-fceu
-      cd fceumm-code/src/drivers/libretro/msvc
+   if [ -d "libretro-fceumm" ]; then
+      echo "=== Building FCEUmm ==="
+      cd libretro-fceumm
+      cd src/drivers/libretro/msvc
       cmd.exe /k $MSVC_NAME.bat
       cp $MSVC_NAME/$RELEASE_LTCG/${MSVC_NAME}.${FORMAT_EXT} "$RARCH_DIST_DIR"/fceumm_libretro$FORMAT.$FORMAT_EXT
    else
-      echo "FCEU not fetched, skipping ..."
+      echo "FCEUmm not fetched, skipping ..."
    fi
 }
 
diff --git a/libretro-build-common.sh b/libretro-build-common.sh
index 5eb7604a..03b7c770 100755
--- a/libretro-build-common.sh
+++ b/libretro-build-common.sh
@@ -494,11 +494,11 @@ build_libretro_vba_next() {
    fi
 }
 
-build_libretro_fceu() {
+build_libretro_fceumm() {
    cd "${BASE_DIR}"
    if [ -d 'libretro-fceu' ]; then
       echo '=== Building FCEUmm ==='
-      cd libretro-fceu
+      cd libretro-fceumm
 
       "${MAKE}" -C fceumm-code -f Makefile.libretro platform="${FORMAT_COMPILER_TARGET}" ${COMPILER} "-j${JOBS}" clean || die 'Failed to clean FCEUmm'
       "${MAKE}" -C fceumm-code -f Makefile.libretro platform="${FORMAT_COMPILER_TARGET}" ${COMPILER} "-j${JOBS}" || die 'Failed to build FCEUmm'
diff --git a/libretro-build-ios.sh b/libretro-build-ios.sh
index 2113e3ab..0243d0ec 100755
--- a/libretro-build-ios.sh
+++ b/libretro-build-ios.sh
@@ -14,7 +14,11 @@ MAKE=make
 CXX11="clang++ -std=c++11 -stdlib=libc++ -miphoneos-version-min=5.0"
 IOS=1
 
+IOSVER=71
+
+ifeq ($(IOSVER),71)
 export IOSSDK=/Applications/Xcode.app/Contents/Developer/Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS7.1.sdk/
+el
 
 . ./libretro-build-common.sh
 
@@ -33,7 +37,7 @@ else
    build_libretro_fba_full
    build_libretro_vbam
    build_libretro_vba_next
-   build_libretro_fceu
+   build_libretro_fceumm
    build_libretro_gambatte
    #build_libretro_meteor
    build_libretro_nx
diff --git a/libretro-build-ngc.sh b/libretro-build-ngc.sh
index 4ff4f854..25f3271d 100755
--- a/libretro-build-ngc.sh
+++ b/libretro-build-ngc.sh
@@ -22,7 +22,7 @@ else
    build_libretro_genplus
    build_libretro_fba
    build_libretro_vba_next
-   build_libretro_fceu
+   build_libretro_fceumm
    build_libretro_gambatte
    build_libretro_nx
    build_libretro_prboom
diff --git a/libretro-build-ps3.sh b/libretro-build-ps3.sh
index 087a3864..9b4c5177 100755
--- a/libretro-build-ps3.sh
+++ b/libretro-build-ps3.sh
@@ -21,7 +21,7 @@ else
    build_libretro_genplus
    build_libretro_fba_full
    build_libretro_vba_next
-   build_libretro_fceu
+   build_libretro_fceumm
    build_libretro_gambatte
    build_libretro_nx
    build_libretro_prboom
diff --git a/libretro-build-psp1.sh b/libretro-build-psp1.sh
index 7e4dc557..59eb8e6c 100755
--- a/libretro-build-psp1.sh
+++ b/libretro-build-psp1.sh
@@ -22,7 +22,7 @@ else
    #build_libretro_fba_full
    build_libretro_fba_cps2
    build_libretro_vba_next
-   build_libretro_fceu
+   build_libretro_fceumm
    build_libretro_gambatte
    build_libretro_nx
    build_libretro_prboom
diff --git a/libretro-build-qnx.sh b/libretro-build-qnx.sh
index 01133dba..66e0a884 100755
--- a/libretro-build-qnx.sh
+++ b/libretro-build-qnx.sh
@@ -28,7 +28,7 @@ else
    build_libretro_vbam
    build_libretro_vba_next
    #build_libretro_bnes
-   build_libretro_fceu
+   build_libretro_fceumm
    build_libretro_gambatte
    #build_libretro_meteor
    build_libretro_nx
diff --git a/libretro-build-wii.sh b/libretro-build-wii.sh
index 2b3ebd09..8a0af6ce 100755
--- a/libretro-build-wii.sh
+++ b/libretro-build-wii.sh
@@ -22,7 +22,7 @@ else
    build_libretro_genplus
    build_libretro_fba
    build_libretro_vba_next
-   build_libretro_fceu
+   build_libretro_fceumm
    build_libretro_gambatte
    build_libretro_nx
    build_libretro_prboom
diff --git a/libretro-build-win.sh b/libretro-build-win.sh
index 290cc7a6..aa765ff2 100644
--- a/libretro-build-win.sh
+++ b/libretro-build-win.sh
@@ -30,7 +30,7 @@ else
    build_libretro_genplus
    #build_libretro_fba
    build_libretro_vba_next
-   build_libretro_fceu
+   build_libretro_fceumm
    build_libretro_gambatte
    build_libretro_nx
    build_libretro_prboom
diff --git a/libretro-build-xdk1.sh b/libretro-build-xdk1.sh
index 5588c9e9..b4fa8420 100644
--- a/libretro-build-xdk1.sh
+++ b/libretro-build-xdk1.sh
@@ -87,7 +87,7 @@ else
    build_libretro_genplus
    build_libretro_fba
    build_libretro_vba_next
-   build_libretro_fceu
+   build_libretro_fceumm
    build_libretro_gambatte
    build_libretro_nx
    build_libretro_prboom
diff --git a/libretro-build-xdk360.sh b/libretro-build-xdk360.sh
index 22e94023..728a47bd 100644
--- a/libretro-build-xdk360.sh
+++ b/libretro-build-xdk360.sh
@@ -43,7 +43,7 @@ else
    build_libretro_genplus
    build_libretro_fba
    build_libretro_vba_next
-   build_libretro_fceu
+   build_libretro_fceumm
    build_libretro_gambatte
    build_libretro_nx
    build_libretro_prboom
diff --git a/libretro-build.sh b/libretro-build.sh
index d40d98e6..1819253c 100755
--- a/libretro-build.sh
+++ b/libretro-build.sh
@@ -107,7 +107,7 @@ else
    build_libretro_vbam
    build_libretro_vba_next
    build_libretro_bnes
-   build_libretro_fceu
+   build_libretro_fceumm
    build_libretro_gambatte
    build_libretro_meteor
    build_libretro_nx
diff --git a/libretro-fetch.sh b/libretro-fetch.sh
index 7bfed791..bd0fcddc 100755
--- a/libretro-fetch.sh
+++ b/libretro-fetch.sh
@@ -83,7 +83,7 @@ fetch_project "$REPO_BASE/libretro/vba-next.git" "libretro-vba-next" "libretro/V
 fetch_project "$REPO_BASE/libretro/vbam-libretro.git" "libretro-vbam" "libretro/VBA-M"
 fetch_project "$REPO_BASE/libretro/libretro-handy.git" "libretro-handy" "libretro/Handy"
 fetch_project "$REPO_BASE/libretro/bnes-libretro.git" "libretro-bnes" "libretro/bNES"
-fetch_project "$REPO_BASE/libretro/fceu-next.git" "libretro-fceu" "libretro/FCEU"
+fetch_project "$REPO_BASE/libretro/libretro-fceumm.git" "libretro-fceumm" "libretro/FCEUmm"
 fetch_project "$REPO_BASE/libretro/gambatte-libretro.git" "libretro-gambatte" "libretro/Gambatte"
 fetch_project "$REPO_BASE/libretro/meteor-libretro.git" "libretro-meteor" "libretro/Meteor"
 fetch_project "$REPO_BASE/libretro/nxengine-libretro.git" "libretro-nx" "libretro/NX"