diff --git a/sysutils/coreutils/Makefile b/sysutils/coreutils/Makefile
index 5108d74caad1..94cef7703572 100644
--- a/sysutils/coreutils/Makefile
+++ b/sysutils/coreutils/Makefile
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	coreutils
-PORTVERSION=	8.23
+PORTVERSION=	8.25
 CATEGORIES=	sysutils textproc
 MASTER_SITES=	GNU
 
@@ -45,7 +45,7 @@ post-build:
 
 post-install:
 	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/g* \
-		${STAGEDIR}${PREFIX}/libexec/coreutils/glibstdbuf.so
+		${STAGEDIR}${PREFIX}/libexec/coreutils/libstdbuf.so
 
 #regression-test: build
 #	(cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} ${MAKE_CMD} check)
diff --git a/sysutils/coreutils/distinfo b/sysutils/coreutils/distinfo
index 4297a36c0237..d47b417fdb68 100644
--- a/sysutils/coreutils/distinfo
+++ b/sysutils/coreutils/distinfo
@@ -1,2 +1,2 @@
-SHA256 (coreutils-8.23.tar.xz) = ec43ca5bcfc62242accb46b7f121f6b684ee21ecd7d075059bf650ff9e37b82d
-SIZE (coreutils-8.23.tar.xz) = 5375612
+SHA256 (coreutils-8.25.tar.xz) = 31e67c057a5b32a582f26408c789e11c2e8d676593324849dcf5779296cdce87
+SIZE (coreutils-8.25.tar.xz) = 5725008
diff --git a/sysutils/coreutils/files/patch-configure b/sysutils/coreutils/files/patch-configure
index 8619fbdd33d9..1281de4769dc 100644
--- a/sysutils/coreutils/files/patch-configure
+++ b/sysutils/coreutils/files/patch-configure
@@ -1,12 +1,11 @@
-diff -r a5a32a34077b configure
---- configure.orig	Tue Oct 30 11:49:55 2012 -0400
-+++ configure	Tue Oct 30 11:51:28 2012 -0400
-@@ -4301,7 +4301,7 @@
+--- configure.orig	2016-01-20 10:32:53 UTC
++++ configure
+@@ -4356,7 +4356,7 @@ for as_dir in $PATH$PATH_SEPARATOR/opt/s
  do
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
 -    for ac_prog in mkdir gmkdir; do
 +    for ac_prog in mkdir; do
  	 for ac_exec_ext in '' $ac_executable_extensions; do
- 	   { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_test_x "$as_dir/$ac_prog$ac_exec_ext"; } || continue
+ 	   as_fn_executable_p "$as_dir/$ac_prog$ac_exec_ext" || continue
  	   case `"$as_dir/$ac_prog$ac_exec_ext" --version 2>&1` in #(
diff --git a/sysutils/coreutils/files/patch-src_stty.c b/sysutils/coreutils/files/patch-src_stty.c
new file mode 100644
index 000000000000..9bc150cc1ba2
--- /dev/null
+++ b/sysutils/coreutils/files/patch-src_stty.c
@@ -0,0 +1,15 @@
+--- src/stty.c.orig	2016-01-07 12:32:35 UTC
++++ src/stty.c
+@@ -287,10 +287,10 @@ static struct mode_info const mode_info[
+ # ifdef TAB3
+   {"tab3", output, SANE_UNSET, TAB3, TABDLY},
+ # endif
+-# ifdef TAB2
++# if 0
+   {"tab2", output, SANE_UNSET, TAB2, TABDLY},
+ # endif
+-# ifdef TAB1
++# if 0
+   {"tab1", output, SANE_UNSET, TAB1, TABDLY},
+ # endif
+ # ifdef TAB0
diff --git a/sysutils/coreutils/files/patch-stty.c b/sysutils/coreutils/files/patch-stty.c
deleted file mode 100644
index ba2723bb64c8..000000000000
--- a/sysutils/coreutils/files/patch-stty.c
+++ /dev/null
@@ -1,24 +0,0 @@
---- src/stty.c.orig	2010-07-21 17:11:49.000000000 +0200
-+++ src/stty.c	2010-07-21 17:12:36.000000000 +0200
-@@ -282,10 +282,10 @@
- # ifdef TAB3
-   {"tab3", output, SANE_UNSET, TAB3, TABDLY},
- # endif
--# ifdef TAB2
-+# if 0
-   {"tab2", output, SANE_UNSET, TAB2, TABDLY},
- # endif
--# ifdef TAB1
-+# if 0
-   {"tab1", output, SANE_UNSET, TAB1, TABDLY},
- # endif
- # ifdef TAB0
-@@ -635,7 +635,7 @@
-       fputs (_("\
-  * [-]onocr      do not print carriage returns in the first column\n\
-    [-]opost      postprocess output\n\
-- * tabN          horizontal tab delay style, N in [0..3]\n\
-+ * tabN          horizontal tab delay style, N in [0,3]\n\
-  * tabs          same as tab0\n\
-  * -tabs         same as tab3\n\
-  * vtN           vertical tab delay style, N in [0..1]\n\
diff --git a/sysutils/coreutils/pkg-plist b/sysutils/coreutils/pkg-plist
index 72b9425aec0a..e8c159eedcf5 100644
--- a/sysutils/coreutils/pkg-plist
+++ b/sysutils/coreutils/pkg-plist
@@ -1,4 +1,5 @@
 bin/g[
+bin/gbase32
 bin/gbase64
 bin/gbasename
 bin/gcat
@@ -47,8 +48,9 @@ bin/gmv
 bin/gnice
 bin/gnl
 bin/gnohup
-bin/gnumfmt
 bin/gnproc
+bin/gnumfmt
+bin/gnustat
 bin/god
 bin/gpaste
 bin/gpathchk
@@ -74,7 +76,6 @@ bin/gshuf
 bin/gsleep
 bin/gsort
 bin/gsplit
-bin/gnustat
 bin/gstdbuf
 bin/gstty
 bin/gsum
@@ -101,7 +102,8 @@ bin/gwc
 bin/gwho
 bin/gwhoami
 bin/gyes
-libexec/coreutils/glibstdbuf.so
+libexec/coreutils/libstdbuf.so
+man/man1/gbase32.1.gz
 man/man1/gbase64.1.gz
 man/man1/gbasename.1.gz
 man/man1/gcat.1.gz
@@ -218,10 +220,10 @@ man/man1/gyes.1.gz
 %%NLS%%share/locale/da/LC_TIME/coreutils.mo
 %%NLS%%share/locale/de/LC_MESSAGES/coreutils.mo
 %%NLS%%share/locale/de/LC_TIME/coreutils.mo
-%%NLS%%share/locale/eo/LC_MESSAGES/coreutils.mo
-%%NLS%%share/locale/eo/LC_TIME/coreutils.mo
 %%NLS%%share/locale/el/LC_MESSAGES/coreutils.mo
 %%NLS%%share/locale/el/LC_TIME/coreutils.mo
+%%NLS%%share/locale/eo/LC_MESSAGES/coreutils.mo
+%%NLS%%share/locale/eo/LC_TIME/coreutils.mo
 %%NLS%%share/locale/es/LC_MESSAGES/coreutils.mo
 %%NLS%%share/locale/es/LC_TIME/coreutils.mo
 %%NLS%%share/locale/et/LC_MESSAGES/coreutils.mo
@@ -248,10 +250,10 @@ man/man1/gyes.1.gz
 %%NLS%%share/locale/it/LC_TIME/coreutils.mo
 %%NLS%%share/locale/ja/LC_MESSAGES/coreutils.mo
 %%NLS%%share/locale/ja/LC_TIME/coreutils.mo
-%%NLS%%share/locale/ko/LC_MESSAGES/coreutils.mo
-%%NLS%%share/locale/ko/LC_TIME/coreutils.mo
 %%NLS%%share/locale/kk/LC_MESSAGES/coreutils.mo
 %%NLS%%share/locale/kk/LC_TIME/coreutils.mo
+%%NLS%%share/locale/ko/LC_MESSAGES/coreutils.mo
+%%NLS%%share/locale/ko/LC_TIME/coreutils.mo
 %%NLS%%share/locale/lg/LC_MESSAGES/coreutils.mo
 %%NLS%%share/locale/lg/LC_TIME/coreutils.mo
 %%NLS%%share/locale/lt/LC_MESSAGES/coreutils.mo
@@ -276,6 +278,8 @@ man/man1/gyes.1.gz
 %%NLS%%share/locale/sk/LC_TIME/coreutils.mo
 %%NLS%%share/locale/sl/LC_MESSAGES/coreutils.mo
 %%NLS%%share/locale/sl/LC_TIME/coreutils.mo
+%%NLS%%share/locale/sr/LC_MESSAGES/coreutils.mo
+%%NLS%%share/locale/sr/LC_TIME/coreutils.mo
 %%NLS%%share/locale/sv/LC_MESSAGES/coreutils.mo
 %%NLS%%share/locale/sv/LC_TIME/coreutils.mo
 %%NLS%%share/locale/tr/LC_MESSAGES/coreutils.mo