diff --git a/packages/sysutils/util-linux/package.mk b/packages/sysutils/util-linux/package.mk
index 99ffc7dca4..480e7e0b30 100644
--- a/packages/sysutils/util-linux/package.mk
+++ b/packages/sysutils/util-linux/package.mk
@@ -17,11 +17,11 @@
 ################################################################################
 
 PKG_NAME="util-linux"
-PKG_VERSION="2.29.2"
-PKG_SHA256="accea4d678209f97f634f40a93b7e9fcad5915d1f4749f6c47bee6bf110fe8e3"
+PKG_VERSION="2.31"
+PKG_SHA256="f9be7cdcf4fc5c5064a226599acdda6bdf3d86c640152ba01ea642d91108dc8a"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"
-PKG_URL="http://www.kernel.org/pub/linux/utils/util-linux/v2.29/$PKG_NAME-$PKG_VERSION.tar.xz"
+PKG_URL="http://www.kernel.org/pub/linux/utils/util-linux/v${PKG_VERSION%-*}/$PKG_NAME-$PKG_VERSION.tar.xz"
 PKG_DEPENDS_HOST="toolchain"
 PKG_DEPENDS_TARGET="toolchain"
 PKG_DEPENDS_INIT="toolchain"
diff --git a/packages/sysutils/util-linux/patches/util-linux-blkid_swapon_mkfs_uuidgen.patch b/packages/sysutils/util-linux/patches/util-linux-blkid_swapon_mkfs_uuidgen.patch
index 7504670e15..a44eb4900e 100644
--- a/packages/sysutils/util-linux/patches/util-linux-blkid_swapon_mkfs_uuidgen.patch
+++ b/packages/sysutils/util-linux/patches/util-linux-blkid_swapon_mkfs_uuidgen.patch
@@ -1,7 +1,7 @@
-diff -Naur util-linux-2.27/configure.ac util-linux-2.27.patch/configure.ac
---- util-linux-2.27/configure.ac	2015-09-07 09:59:25.000000000 +0200
-+++ util-linux-2.27.patch/configure.ac	2015-09-12 10:35:53.576532786 +0200
-@@ -1051,11 +1051,19 @@
+diff -Naur a/configure.ac b/configure.ac
+--- a/configure.ac	2017-10-03 08:53:23.956354391 -0700
++++ b/configure.ac	2017-10-09 16:39:14.213671977 -0700
+@@ -1156,7 +1156,11 @@
  AM_CONDITIONAL([BUILD_UUIDD], [test "x$build_uuidd" = xyes])
  
  
@@ -14,6 +14,10 @@ diff -Naur util-linux-2.27/configure.ac util-linux-2.27.patch/configure.ac
  UL_REQUIRES_BUILD([uuidgen], [libuuid])
  AM_CONDITIONAL([BUILD_UUIDGEN], [test "x$build_uuidgen" = xyes])
  
+@@ -1165,7 +1169,11 @@
+ UL_REQUIRES_BUILD([uuidparse], [libsmartcols])
+ AM_CONDITIONAL([BUILD_UUIDPARSE], [test "x$build_uuidparse" = xyes])
+ 
 -UL_BUILD_INIT([blkid], [check])
 +AC_ARG_ENABLE([blkid],
 +  AS_HELP_STRING([--disable-blkid], [do not build blkid(8)]),
@@ -23,11 +27,10 @@ diff -Naur util-linux-2.27/configure.ac util-linux-2.27.patch/configure.ac
  UL_REQUIRES_BUILD([blkid], [libblkid])
  AM_CONDITIONAL([BUILD_BLKID], [test "x$build_blkid" = xyes])
  
-@@ -1242,21 +1250,26 @@
- UL_REQUIRES_HAVE([hwclock], [io, linuxdummy], [ioperm iopl function or Linux])
+@@ -1403,7 +1411,11 @@
  AM_CONDITIONAL([BUILD_HWCLOCK], [test "x$build_hwclock" = xyes])
  
--
+ 
 -UL_BUILD_INIT([mkfs], [yes])
 +AC_ARG_ENABLE([mkfs],
 +  AS_HELP_STRING([--disable-mkfs], [do not build mkfs(8)]),
@@ -37,15 +40,10 @@ diff -Naur util-linux-2.27/configure.ac util-linux-2.27.patch/configure.ac
  AM_CONDITIONAL([BUILD_MKFS], [test "x$build_mkfs" = xyes])
  
  UL_BUILD_INIT([isosize], [yes])
- AM_CONDITIONAL([BUILD_ISOSIZE], [test "x$build_isosize" = xyes])
- 
--
- UL_BUILD_INIT([fstrim], [check])
- UL_REQUIRES_LINUX([fstrim])
- UL_REQUIRES_BUILD([fstrim], [libmount])
+@@ -1416,7 +1428,11 @@
  AM_CONDITIONAL([BUILD_FSTRIM], [test "x$build_fstrim" = xyes])
  
--
+ 
 -UL_BUILD_INIT([swapon], [check])
 +AC_ARG_ENABLE([swapon],
 +  AS_HELP_STRING([--disable-swapon], [do not build swapon(8) and swapoff(8)]),