diff --git a/src/mod/languages/mod_v8/Makefile.am b/src/mod/languages/mod_v8/Makefile.am
index 7b3abc8a9d..6ee67af022 100644
--- a/src/mod/languages/mod_v8/Makefile.am
+++ b/src/mod/languages/mod_v8/Makefile.am
@@ -3,67 +3,32 @@ include $(top_srcdir)/build/modmake.rulesam
 AUTOMAKE_OPTIONS += foreign
 
 # V8 version to use
-V8=v8-3.24.14
+V8_VERSION=6.1.298
+V8=v8-$(V8_VERSION)
 
-V8_DIR=$(switch_srcdir)/libs/$(V8)
-V8_BUILDDIR=$(switch_builddir)/libs/$(V8)
+V8_DIR=$(switch_srcdir)/libs/$(V8)/v8
+V8_DEPOT_TOOLS_PATH=$(switch_builddir)/libs/$(V8)
+V8_BUILDDIR=$(V8_DEPOT_TOOLS_PATH)/v8
+
+V8_LIBDIR=$(V8_BUILDDIR)/out.gn/$(V8_TARGET).release
 
 if ISMAC
-V8_LIBDIR=$(V8_BUILDDIR)/out/native
 V8_LIBEXT=dylib
-# Build with snapshot doesn't work for OSX right now
-V8_BUILDPARAMS=snapshot=off i18nsupport=off
-V8_SNAPSHOT=nosnapshot
 else
-V8_LIBDIR=$(V8_BUILDDIR)/out/native/lib.target
 V8_LIBEXT=so
-# Some gcc versions report warnings incorrectly
-V8_BUILDPARAMS=strictaliasing=off werror=no i18nsupport=off
-V8_SNAPSHOT=snapshot
 endif
 
-if ENABLE_STATIC_V8
-# Build the static lib version of V8
-if ISMAC
-V8_STATIC_DIR=$(V8_BUILDDIR)/out/native
-V8_ICU_STATIC_DIR=$(V8_BUILDDIR)/out/native
-V8_CXXFLAGS =
-else
-V8_STATIC_DIR=$(V8_BUILDDIR)/out/native/obj.target/tools/gyp
-V8_ICU_STATIC_DIR=$(V8_BUILDDIR)/out/native/obj.target/third_party/icu
-V8_CXXFLAGS = -fPIC
-endif
-V8LIB=$(V8_STATIC_DIR)/libv8_base*.a
-else
 # Build the dynamic lib version of V8
-V8_BUILDPARAMS += library=shared
 V8LIB=$(V8_LIBDIR)/libv8.$(V8_LIBEXT)
-endif
-
-if ENABLE_PARALLEL_BUILD_V8
-V8_EXTRA_BUILD_PARAMS=
-else
-V8_EXTRA_BUILD_PARAMS=--no-parallel
-endif
-
-# Try to find the target platform for our configured CXX compiler
-# Parse the result one extra time to handle different i386 platforms (i386, i486 etc)
-CXX_TARGET_PLATFORM := $(shell $(CXX) -v 2>&1 | grep Target | cut '-d:' -f2 | cut '-d-' -f1 | tr -d ' ')
-CXX_TARGET_PLATFORM_I386 := $(shell echo "$(CXX_TARGET_PLATFORM)" | sed 's/^\(.\{1\}\)\(.\{1\}\)/\13/')
 
 MODNAME=mod_v8
 
 AM_CFLAGS    += -I. -I./include -I$(switch_srcdir)/src/mod/languages/mod_v8/include -I$(V8_DIR)/include
-AM_CPPFLAGS  += -I. -I./include -I$(switch_srcdir)/src/mod/languages/mod_v8/include -I$(V8_DIR)/include
+AM_CPPFLAGS  += -I. -I./include -I$(switch_srcdir)/src/mod/languages/mod_v8/include -I$(V8_DIR)/include -std=c++11
 AM_LDFLAGS   += -avoid-version -module -no-undefined -shared
 
-if ENABLE_STATIC_V8
-AM_LIBADD     = $(switch_builddir)/libfreeswitch.la
-V8_LDFLAGS    = $(V8_STATIC_DIR)/libv8_{base*,$(V8_SNAPSHOT)*}.a $(SOLINK) #$(V8_ICU_STATIC_DIR)/libicu{i18n,uc,data}.a $(SOLINK)
-else
-AM_LIBADD     = $(switch_builddir)/libfreeswitch.la -lv8 #-licuuc -licui18n
+AM_LIBADD     = $(switch_builddir)/libfreeswitch.la -lv8 -lv8_libbase -lv8_libplatform
 AM_LDFLAGS   += -L$(V8_LIBDIR)
-endif
 
 BUILT_SOURCES = $(V8LIB)
 
@@ -99,7 +64,7 @@ mod_v8_la_SOURCES  = \
 mod_v8_la_CFLAGS   = $(AM_CFLAGS) -I$(switch_srcdir)/libs/libteletone/src
 mod_v8_la_CPPFLAGS = $(CURL_CFLAGS) $(AM_CPPFLAGS) -I$(switch_srcdir)/libs/libteletone/src
 mod_v8_la_LIBADD   = $(AM_LIBADD)
-mod_v8_la_LDFLAGS  = $(CURL_LIBS) $(AM_LDFLAGS) $(V8_LDFLAGS)
+mod_v8_la_LDFLAGS  = $(CURL_LIBS) $(AM_LDFLAGS)
 
 #mod_LTLIBRARIES        += mod_v8_skel.la
 #mod_v8_skel_la_SOURCES  = mod_v8_skel.cpp
@@ -110,54 +75,27 @@ mod_v8_la_LDFLAGS  = $(CURL_LIBS) $(AM_LDFLAGS) $(V8_LDFLAGS)
 
 $(SOURCES): $(BUILT_SOURCES)
 
-$(V8_DIR):
-	$(GETLIB) $(V8).tar.bz2
-if ISFREEBSD
-	/bin/cp -f gyp  $(V8_DIR)/build/gyp
-endif
+$(V8LIB):
+	mkdir -p $(V8_DEPOT_TOOLS_PATH)
+	cd $(V8_DEPOT_TOOLS_PATH) && \
+	export PATH=`pwd`/depot_tools:"$$PATH" && \
+	if [ ! -d "$(V8_DEPOT_TOOLS_PATH)/depot_tools" ] ; then git clone https://chromium.googlesource.com/chromium/tools/depot_tools.git && fetch v8 ; fi && \
+	cd v8 && \
+	git checkout $(V8_VERSION) && \
+	gclient sync && \
+	tools/dev/v8gen.py -vv $(V8_TARGET).release -- is_debug=false is_component_build=true v8_enable_i18n_support=false v8_use_external_startup_data=false && \
+	ninja -C out.gn/$(V8_TARGET).release/ d8
 
-$(V8_DIR)/.stamp-patch: $(V8_DIR)
-	cd $(V8_DIR) && (test -f .stamp-patch || patch -t -p0 < $(switch_srcdir)/src/mod/languages/mod_v8/v8-build.patch)
-	touch $@
-
-$(V8LIB): $(V8_DIR) $(V8_DIR)/.stamp-patch
-	mkdir -p $(V8_BUILDDIR)
-	if test "$(CXX_TARGET_PLATFORM)" = "x86_64"; then \
-	   defines="v8_target_arch=x64 target_arch=x64"; \
-	else \
-	   if test "$(CXX_TARGET_PLATFORM)" = "arm"; then \
-	      defines="v8_target_arch=arm target_arch=arm"; \
-	   else \
-	      if test "$(CXX_TARGET_PLATFORM_I386)" = "i386"; then \
-	         defines="v8_target_arch=ia32 target_arch=ia32"; \
-	      fi; \
-	   fi; \
-	fi; \
-	cd $(V8_BUILDDIR) && CFLAGS="$(V8_CXXFLAGS)" CXXFLAGS="$(V8_CXXFLAGS)" \
-	LINK=@CXX@ CXX=@CXX@ GYPFLAGS="$(V8_EXTRA_BUILD_PARAMS)" GYP_DEFINES="$$defines" \
-	OUTDIR=$(V8_BUILDDIR)/out \
-	PYTHONPATH="$(V8_DIR)/build/gyp/pylib:$(PYTHONPATH)" $(MAKE) -C $(V8_DIR) $(V8_BUILDPARAMS) native
-
-if ENABLE_STATIC_V8
-install-exec-local: $(V8LIB)
-else
 # This is a temporary solution to force Mac OSX build to load the libraries at the right place
 if ISMAC
 install-exec-local: $(DESTDIR)$(libdir)/libv8.$(V8_LIBEXT)
-	install_name_tool -change /usr/local/lib/libv8.$(V8_LIBEXT) $(DESTDIR)$(libdir)/libv8.$(V8_LIBEXT) .libs/mod_v8.so
-#	install_name_tool -change /usr/local/lib/libicuuc.$(V8_LIBEXT) $(DESTDIR)$(libdir)/libicuuc.$(V8_LIBEXT) .libs/mod_v8.so
-#	install_name_tool -change /usr/local/lib/libicui18n.$(V8_LIBEXT) $(DESTDIR)$(libdir)/libicui18n.$(V8_LIBEXT) .libs/mod_v8.so
-	install_name_tool -change /usr/local/lib/libv8.$(V8_LIBEXT) $(DESTDIR)$(libdir)/libv8.$(V8_LIBEXT) $(DESTDIR)$(libdir)/libv8.$(V8_LIBEXT)
-#	install_name_tool -change /usr/local/lib/libicuuc.$(V8_LIBEXT) $(DESTDIR)$(libdir)/libicuuc.$(V8_LIBEXT) $(DESTDIR)$(libdir)/libv8.$(V8_LIBEXT)
-#	install_name_tool -change /usr/local/lib/libicui18n.$(V8_LIBEXT) $(DESTDIR)$(libdir)/libicui18n.$(V8_LIBEXT) $(DESTDIR)$(libdir)/libv8.$(V8_LIBEXT)
-#	install_name_tool -change /usr/local/lib/libicuuc.$(V8_LIBEXT) $(DESTDIR)$(libdir)/libicuuc.$(V8_LIBEXT) $(DESTDIR)$(libdir)/libicui18n.$(V8_LIBEXT)
-#	install_name_tool -change /usr/local/lib/libicui18n.$(V8_LIBEXT) $(DESTDIR)$(libdir)/libicui18n.$(V8_LIBEXT) $(DESTDIR)$(libdir)/libicui18n.$(V8_LIBEXT)
-#	install_name_tool -change /usr/local/lib/libicuuc.$(V8_LIBEXT) $(DESTDIR)$(libdir)/libicuuc.$(V8_LIBEXT) $(DESTDIR)$(libdir)/libicuuc.$(V8_LIBEXT)
+	install_name_tool -change @rpath/libv8.$(V8_LIBEXT) $(libdir)/libv8.$(V8_LIBEXT) .libs/mod_v8.so
+	install_name_tool -change @rpath/libv8_libbase.$(V8_LIBEXT) $(libdir)/libv8_libbase.$(V8_LIBEXT) .libs/mod_v8.so
+	install_name_tool -change @rpath/libv8_libplatform.$(V8_LIBEXT) $(libdir)/libv8_libplatform.$(V8_LIBEXT) .libs/mod_v8.so
 else
 install-exec-local: $(DESTDIR)$(libdir)/libv8.$(V8_LIBEXT)
 endif
 $(DESTDIR)$(libdir)/libv8.$(V8_LIBEXT): $(V8LIB)
 	rm -f $(DESTDIR)$(libdir)/libv8.$(V8_LIBEXT) && cp -a $(V8_LIBDIR)/libv8.$(V8_LIBEXT) $(DESTDIR)$(libdir)/libv8.$(V8_LIBEXT)
-#	rm -f $(DESTDIR)$(libdir)/libicuuc.$(V8_LIBEXT) && cp -a $(V8_LIBDIR)/libicuuc.$(V8_LIBEXT) $(DESTDIR)$(libdir)/libicuuc.$(V8_LIBEXT)
-#	rm -f $(DESTDIR)$(libdir)/libicui18n.$(V8_LIBEXT) && cp -a $(V8_LIBDIR)/libicui18n.$(V8_LIBEXT) $(DESTDIR)$(libdir)/libicui18n.$(V8_LIBEXT)
-endif
+	rm -f $(DESTDIR)$(libdir)/libv8_libbase.$(V8_LIBEXT) && cp -a $(V8_LIBDIR)/libv8_libbase.$(V8_LIBEXT) $(DESTDIR)$(libdir)/libv8_libbase.$(V8_LIBEXT)
+	rm -f $(DESTDIR)$(libdir)/libv8_libplatform.$(V8_LIBEXT) && cp -a $(V8_LIBDIR)/libv8_libplatform.$(V8_LIBEXT) $(DESTDIR)$(libdir)/libv8_libplatform.$(V8_LIBEXT)