Index: Makefile
===================================================================
--- Makefile	(revision 407680)
+++ Makefile	(working copy)
@@ -24,10 +24,10 @@
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	emacs-mirror
-GH_TAGNAME=	0a7ad07
+GH_TAGNAME=	43cb9f8
 
-EMACS_VER=	25.0.50
-EMACS_REV=	20160102
+EMACS_VER=	25.0.90
+EMACS_REV=	20160201
 GNU_CONFIGURE=	yes
 USES=		autoreconf cpe gmake makeinfo ncurses pkgconfig
 CPPFLAGS+=	-I${LOCALBASE}/include
@@ -57,7 +57,7 @@
 
 OPTIONS_DEFINE=	X11 ACL DBUS GCONF GIF JPEG M17N OTF PNG SOUND        \
 		SOURCES SVG TIFF SCROLLBARS XFT XIM XML XPM MAGICK    \
-		GNUTLS GSETTINGS LTO FILENOTIFY LLDB CAIRO MODULES
+		GNUTLS GSETTINGS LTO FILENOTIFY LLDB CAIRO MODULES XWIDGETS
 
 OPTIONS_SINGLE=	X11 SOUND
 
@@ -75,6 +75,7 @@
 LTO_DESC=	Enable link-time optimization (requires GCC 4.6+)
 LLDB_DESC=	Enable lldb support for GUD (from llvm.org)
 MODULES_DESC=	Dynamic modules support
+XWIDGETS_DESC=  Enable use of some GTK widgets in Emacs buffers
 
 OPTIONS_SINGLE_X11=	GTK2 GTK3 XAW XAW3D MOTIF
 OPTIONS_SINGLE_SOUND=	ALSA OSS
@@ -177,6 +178,9 @@
 
 MODULES_CONFIGURE_ON=	--with-modules
 
+XWIDGETS_CONFIGURE_ON=	--with-xwidgets
+XWIDGETS_LIB_DEPENDS=	libwebkitgtk-3.0.so:${PORTSDIR}/www/webkit-gtk3
+
 .include <bsd.port.options.mk>
 
 # clang is broken on i386 platform in -O2, due to use of alloca, and
@@ -196,7 +200,7 @@
 .if ${PORT_OPTIONS:MM17N}
 IGNORE=		m17n requires Xft. Please run 'make config'
 .elif ${PORT_OPTIONS:MOTF}
-IGNORE=		Opentype fonts require Xft. Please run 'make config'
+IGNORE=		support for Opentype fonts require Xft. Please run 'make config'
 .endif
 .endif
 .else
@@ -210,10 +214,16 @@
 
 .if !${PORT_OPTIONS:MDBUS}
 .if ${PORT_OPTIONS:MGSETTINGS}
-IGNORE=		GSettings requires DBUS. Please run 'make config'
+IGNORE=		support for GSettings requires DBUS. Please run 'make config'
 .endif
 .endif
 
+.if !${PORT_OPTIONS:MGTK3}
+.if ${PORT_OPTIONS:MXWIDGETS}
+IGNORE=		support for XWidgets requires GTK3. Please run 'make config'
+.endif
+.endif
+
 .include <bsd.port.pre.mk>
 
 # Building with GCC 4.6+ requires it
Index: distinfo
===================================================================
--- distinfo	(revision 407680)
+++ distinfo	(working copy)
@@ -1,2 +1,2 @@
-SHA256 (emacs-mirror-emacs-25.0.50.20160102-0a7ad07_GH0.tar.gz) = 0883118a6399a3934c15f765535c7dc353a32b5ad1e72d4cf6370acd470b9e73
-SIZE (emacs-mirror-emacs-25.0.50.20160102-0a7ad07_GH0.tar.gz) = 37743615
+SHA256 (emacs-mirror-emacs-25.0.90.20160201-43cb9f8_GH0.tar.gz) = 5482721c63b3ebdc787f72c072bec778fdc62682159e7c2fdc245188d68b547e
+SIZE (emacs-mirror-emacs-25.0.90.20160201-43cb9f8_GH0.tar.gz) = 37903227
Index: files/patch-sources.el
===================================================================
--- files/patch-sources.el	(revision 407680)
+++ files/patch-sources.el	(working copy)
@@ -1,4 +1,4 @@
---- /dev/null
+--- sources.el.orig	2016-02-01 06:06:37 UTC
 +++ sources.el
 @@ -0,0 +1,4 @@
 +;;; Path to Emacs C Sources.
Index: pkg-plist
===================================================================
--- pkg-plist	(revision 407680)
+++ pkg-plist	(working copy)
@@ -2756,8 +2756,6 @@
 %%DATADIR%%/%%EMACS_VER%%/lisp/net/dig.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/net/dns.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/net/dns.elc
-%%DATADIR%%/%%EMACS_VER%%/lisp/net/eudc-bob.el.gz
-%%DATADIR%%/%%EMACS_VER%%/lisp/net/eudc-bob.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/net/eudc-export.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/net/eudc-export.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/net/eudc-hotlist.el.gz
@@ -2768,6 +2766,8 @@
 %%DATADIR%%/%%EMACS_VER%%/lisp/net/eudc.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/net/eudcb-bbdb.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/net/eudcb-bbdb.elc
+%%DATADIR%%/%%EMACS_VER%%/lisp/net/eudc-bob.el.gz
+%%DATADIR%%/%%EMACS_VER%%/lisp/net/eudc-bob.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/net/eudcb-ldap.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/net/eudcb-ldap.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/net/eudcb-mab.el.gz
@@ -3942,6 +3942,8 @@
 %%DATADIR%%/%%EMACS_VER%%/lisp/xml.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/xt-mouse.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/xt-mouse.elc
+%%DATADIR%%/%%EMACS_VER%%/lisp/xwidget.el.gz
+%%DATADIR%%/%%EMACS_VER%%/lisp/xwidget.elc
 %%DATADIR%%/%%EMACS_VER%%/site-lisp/subdirs.el
 %%SOURCES%%%%DATADIR%%/%%EMACS_VER%%/site-lisp/site-start.el
 %%SOURCES%%%%DATADIR%%/%%EMACS_VER%%/src/alloc.c
@@ -4035,6 +4037,7 @@
 %%SOURCES%%%%DATADIR%%/%%EMACS_VER%%/src/keyboard.h
 %%SOURCES%%%%DATADIR%%/%%EMACS_VER%%/src/keymap.c
 %%SOURCES%%%%DATADIR%%/%%EMACS_VER%%/src/keymap.h
+%%SOURCES%%%%DATADIR%%/%%EMACS_VER%%/src/kqueue.c
 %%SOURCES%%%%DATADIR%%/%%EMACS_VER%%/src/lastfile.c
 %%SOURCES%%%%DATADIR%%/%%EMACS_VER%%/src/lisp.h
 %%SOURCES%%%%DATADIR%%/%%EMACS_VER%%/src/lread.c
@@ -4094,6 +4097,8 @@
 %%SOURCES%%%%DATADIR%%/%%EMACS_VER%%/src/unexsol.c
 %%SOURCES%%%%DATADIR%%/%%EMACS_VER%%/src/unexw32.c
 %%SOURCES%%%%DATADIR%%/%%EMACS_VER%%/src/vm-limit.c
+%%SOURCES%%%%DATADIR%%/%%EMACS_VER%%/src/xwidget.c
+%%SOURCES%%%%DATADIR%%/%%EMACS_VER%%/src/xwidget.h
 %%SOURCES%%%%DATADIR%%/%%EMACS_VER%%/src/w16select.c
 %%SOURCES%%%%DATADIR%%/%%EMACS_VER%%/src/w32.c
 %%SOURCES%%%%DATADIR%%/%%EMACS_VER%%/src/w32.h