diff --git a/cores/libretro-ffmpeg/Makefile b/cores/libretro-ffmpeg/Makefile
index 6535e239a5..193a38839b 100644
--- a/cores/libretro-ffmpeg/Makefile
+++ b/cores/libretro-ffmpeg/Makefile
@@ -75,6 +75,11 @@ endif
 
 TARGET_NAME := ffmpeg
 
+GIT_VERSION ?= " $(shell git rev-parse --short HEAD || echo unknown)"
+ifneq ($(GIT_VERSION)," unknown")
+       CFLAGS += -DGIT_VERSION=\"$(GIT_VERSION)\"
+endif
+
 ifneq (,$(findstring unix,$(platform)))
 	ARCH_X86 = 1
    TARGET := $(TARGET_NAME)_libretro.so
@@ -123,7 +128,7 @@ else ifneq (,$(findstring ios,$(platform)))
    TARGET := $(TARGET_NAME)_libretro_ios.dylib
    fpic := -fPIC
    SHARED := -dynamiclib
-   CFLAGS += -I. -I.. -DHAVE_FMINF -DIOS
+   CFLAGS += -I. -I.. -DHAVE_FMINF -DIOS -DHAVE_UNISTD_H
 ifeq ($(OPENGL),1)
 	HAVE_OPENGL = 1
 	GLES = 1
@@ -140,11 +145,16 @@ ifeq ($(IOSSDK),)
   IOSSDK := $(shell xcodebuild -version -sdk iphoneos Path)
 endif
 
+ifeq ($(platform),ios-arm64)
+   CC = cc -arch arm64 -isysroot $(IOSSDK)
+   CXX  = c++ -arch arm64 -isysroot $(IOSSDK)
+else
    CC = cc -arch armv7 -isysroot $(IOSSDK)
    CXX  = c++ -arch armv7 -isysroot $(IOSSDK)
    LD = armv7-apple-darwin11-ld
+endif
 
-ifeq ($(platform),ios9)
+ifeq ($(platform),$(filter $(platform),ios9 ios-arm64))
    CC += -miphoneos-version-min=8.0
    CFLAGS += -miphoneos-version-min=8.0
 else
@@ -189,6 +199,10 @@ endif
    LIBS += -L.
 endif
 
+ifeq ($(LIBRETRO_SWITCH), 1)
+   CFLAGS += -DUPSTREAM_VERSION=\"$(shell cat ../RELEASE)\"
+endif
+
 CFLAGS += -D__LIBRETRO__
 
 include Makefile.common