diff --git a/debian/changelog b/debian/changelog
index 4164b3d3be253e813857962518fdcee317fcead2..d4d7e92b2c32c1a27239d6dc1e11cd83050f9583 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,19 @@
+mariadb-10.1 (10.1.31-0ubuntu0.17.10.1) artful-security; urgency=high
+
+  * SECURITY UPDATE: New upstream release 10.1.31. Includes fixes for
+    the following security vulnerabilities (LP: #1751920):
+    - CVE-2018-2668
+    - CVE-2018-2665
+    - CVE-2018-2640
+    - CVE-2018-2622
+    - CVE-2018-2612
+    - CVE-2018-2562
+  * Update git-buildpackage Debian branch setting so gbp import-orig works
+  * Update git-buildpackage filters to match master branch
+  * Update VCS-* links to point to the new source repository
+
+ -- Otto Kekäläinen <otto@debian.org>  Mon, 26 Feb 2018 18:07:57 -0500
+
 mariadb-10.1 (10.1.30-0ubuntu0.17.10.1) artful-security; urgency=high
 
   [ Otto Kekäläinen ]
diff --git a/debian/patches/0026-Mroonga-fix-ice-arm64.patch b/debian/patches/0026-Mroonga-fix-ice-arm64.patch
index 6b8aeb5d3bc6ed194076dd6389d647224b43e825..1f5d4b62871c486e2201fed18d76457b884fe188 100644
--- a/debian/patches/0026-Mroonga-fix-ice-arm64.patch
+++ b/debian/patches/0026-Mroonga-fix-ice-arm64.patch
@@ -18,5 +18,5 @@ index 44378cfa..a3d838c3 100644
 -  return (lhs < rhs) || (lhs > rhs);
 +  return !grn_ts_op_equal_float(lhs, rhs);
  }
-
+ 
  /* grn_ts_op_not_equal_time() returns lhs != rhs. */
diff --git a/debian/patches/c11_atomics.patch b/debian/patches/c11_atomics.patch
index 9154fe6a2e816c72d8671f94b9581f99e64ee87e..88b2420b3c4ea11d3c1443a9369053f1eca2165d 100644
--- a/debian/patches/c11_atomics.patch
+++ b/debian/patches/c11_atomics.patch
@@ -23,7 +23,7 @@ index 0057c7f..43ad114 100644
      ${LIBM} ${LIBNSL} ${LIBBIND} ${LIBCRYPT} ${LIBSOCKET} ${LIBDL} ${CMAKE_THREAD_LIBS_INIT} ${LIBRT} ${LIBEXECINFO})
    # Need explicit pthread for gcc -fsanitize=address
    IF(CMAKE_USE_PTHREADS_INIT AND CMAKE_C_FLAGS MATCHES "-fsanitize=")
-@@ -1028,7 +1028,26 @@ ELSEIF(NOT WITH_ATOMIC_OPS)
+@@ -1038,7 +1038,26 @@ ELSEIF(NOT WITH_ATOMIC_OPS)
      long long int *ptr= &var;
      return (int)__atomic_load_n(ptr, __ATOMIC_SEQ_CST);
    }"
diff --git a/debian/patches/extend_default_test_timeout_for_tokudb.patch b/debian/patches/extend_default_test_timeout_for_tokudb.patch
index 3a6dfb90fe310e3ff6ecb86453efcbccfc542ba7..7cbf38275bf5b7f08105fd56df73a0505fed1832 100644
--- a/debian/patches/extend_default_test_timeout_for_tokudb.patch
+++ b/debian/patches/extend_default_test_timeout_for_tokudb.patch
@@ -10,7 +10,7 @@ diff --git a/mysql-test/CMakeLists.txt b/mysql-test/CMakeLists.txt
 index 1c7cfaf..bc45177 100644
 --- a/mysql-test/CMakeLists.txt
 +++ b/mysql-test/CMakeLists.txt
-@@ -64,7 +64,7 @@ ELSE()
+@@ -65,7 +65,7 @@ ELSE()
  ENDIF()
  
  
diff --git a/debian/patches/kFreeBSD-gettid.patch b/debian/patches/kFreeBSD-gettid.patch
index 396a75d976f07a90a3e8b4cdaadca346b0c4eedc..f9beb8e6ee267df72c6f0482308ae1ff8d6df196 100644
--- a/debian/patches/kFreeBSD-gettid.patch
+++ b/debian/patches/kFreeBSD-gettid.patch
@@ -10,7 +10,7 @@ diff --git a/storage/tokudb/PerconaFT/portability/portability.cc b/storage/tokud
 index 19f445a..73dce92 100644
 --- a/storage/tokudb/PerconaFT/portability/portability.cc
 +++ b/storage/tokudb/PerconaFT/portability/portability.cc
-@@ -115,6 +115,10 @@ toku_os_gettid(void) {
+@@ -118,6 +118,10 @@ toku_os_gettid(void) {
      return syscall(SYS_gettid);
  #elif defined(HAVE_PTHREAD_GETTHREADID_NP)
      return pthread_getthreadid_np();
diff --git a/debian/patches/libmariadbclient-rename.patch b/debian/patches/libmariadbclient-rename.patch
index c4410a8821c410d47277a1e9857a2a007273f052..31189dc155bbffd842c246c22952f976fbd4bc10 100644
--- a/debian/patches/libmariadbclient-rename.patch
+++ b/debian/patches/libmariadbclient-rename.patch
@@ -173,9 +173,9 @@ index acbd80b..5819d79 100644
 +      OUTPUT_NAME mariadbclient 
        VERSION "${OS_SHARED_LIB_VERSION}" 
        SOVERSION "${SHARED_LIB_MAJOR_VERSION}")
-     IF(LINK_FLAG_NO_UNDEFINED OR VERSION_SCRIPT_LINK_FLAGS)
+     IF(VERSION_SCRIPT_LINK_FLAGS)
 @@ -510,13 +515,13 @@ IF(NOT DISABLE_SHARED)
-         "${libmysql_link_flags} ${LINK_FLAG_NO_UNDEFINED} ${VERSION_SCRIPT_LINK_FLAGS}")
+         "${libmysql_link_flags} ${VERSION_SCRIPT_LINK_FLAGS}")
      ENDIF() 
      # clean direct output needs to be set several targets have the same name
 -    #(mysqlclient in this case)
diff --git a/debian/patches/mysql-test__db_test.patch b/debian/patches/mysql-test__db_test.patch
index 52fa97b762debb1a2d01a4096d244d0dab278021..4c6e8c86f01a8be91d68e694fe1d23a97b3465cb 100644
--- a/debian/patches/mysql-test__db_test.patch
+++ b/debian/patches/mysql-test__db_test.patch
@@ -16,7 +16,7 @@ diff --git a/mysql-test/mysql-test-run.pl b/mysql-test/mysql-test-run.pl
 index ac9f493..7e7f116 100755
 --- a/mysql-test/mysql-test-run.pl
 +++ b/mysql-test/mysql-test-run.pl
-@@ -3203,6 +3203,10 @@ sub mysql_install_db {
+@@ -3207,6 +3207,10 @@ sub mysql_install_db {
        mtr_appendfile_to_file("$sql_dir/mysql_system_tables_data.sql",
             $bootstrap_sql_file);
  
diff --git a/debian/patches/scripts__mysql_install_db.sh__no_test.patch b/debian/patches/scripts__mysql_install_db.sh__no_test.patch
index 1e16901b8e01c56a18cf0bd385b7080770f1db7e..0904be09779f2ad44558f22ecbbd9692047bea61 100644
--- a/debian/patches/scripts__mysql_install_db.sh__no_test.patch
+++ b/debian/patches/scripts__mysql_install_db.sh__no_test.patch
@@ -15,7 +15,7 @@ diff --git a/scripts/mysql_install_db.sh b/scripts/mysql_install_db.sh
 index aad9ef5..c6f0e3c 100644
 --- a/scripts/mysql_install_db.sh
 +++ b/scripts/mysql_install_db.sh
-@@ -408,7 +408,7 @@ then
+@@ -414,7 +414,7 @@ then
  fi
  
  # Create database directories