diff --git a/.gitignore b/.gitignore
index 476e2a4..ff0ed30 100644
--- a/.gitignore
+++ b/.gitignore
@@ -64,3 +64,4 @@ simple-scan-2.31.5.tar.bz2
 /simple-scan-3.23.3.tar.xz
 /simple-scan-3.23.90.tar.xz
 /simple-scan-3.24.0.tar.xz
+/simple-scan-3.25.1.tar.xz
diff --git a/simple-scan-3.25.1-fix-vala-syntax.patch b/simple-scan-3.25.1-fix-vala-syntax.patch
new file mode 100644
index 0000000..28a6f46
--- /dev/null
+++ b/simple-scan-3.25.1-fix-vala-syntax.patch
@@ -0,0 +1,21 @@
+diff -urN simple-scan-3.25.1.old/src/ui.vala simple-scan-3.25.1/src/ui.vala
+--- simple-scan-3.25.1.old/src/ui.vala	2017-04-25 04:10:18.000000000 +0100
++++ simple-scan-3.25.1/src/ui.vala	2017-04-25 13:38:49.425811115 +0100
+@@ -467,7 +467,7 @@
+                 for (i = 0; i < n_delete; i++)
+                 {
+                     device_model.iter_nth_child (out iter, null, index);
+-                    device_model.remove (iter);
++                    device_model.remove (ref iter);
+                 }
+             }
+             else
+@@ -480,7 +480,7 @@
+ 
+         /* Remove any remaining devices */
+         while (device_model.iter_nth_child (out iter, null, index))
+-            device_model.remove (iter);
++            device_model.remove (ref iter);
+ 
+         /* Select the previously selected device or the first available device */
+         if (!have_selection)
diff --git a/simple-scan.spec b/simple-scan.spec
index 73d964f..023317e 100644
--- a/simple-scan.spec
+++ b/simple-scan.spec
@@ -1,12 +1,15 @@
 Name:           simple-scan
-Version:        3.24.0
+Version:        3.25.1
 Release:        1%{?dist}
 Summary:        Simple scanning utility
 
 License:        GPLv3+
 URL:            https://launchpad.net/%{name}
-Source0:        %{url}/3.24/%{version}/+download/%{name}-%{version}.tar.xz
+Source0:        %{url}/3.25/%{version}/+download/%{name}-%{version}.tar.xz
+# https://bugs.launchpad.net/simple-scan/+bug/1686083
+Patch0:         simple-scan-3.25.1-fix-vala-syntax.patch
 
+BuildRequires:  meson
 BuildRequires:  sane-backends-devel
 BuildRequires:  gettext
 BuildRequires:  itstool
@@ -27,14 +30,14 @@ Simple Scan is an easy-to-use application, designed to let users connect their
 scanner and quickly have the image/document in an appropriate format.
 
 %prep
-%setup -q
+%autosetup -p1
 
 %build
-%configure
-%make_build V=1
+%meson
+%meson_build
 
 %install
-%make_install
+%meson_install
 %find_lang %{name} --with-man --with-gnome
 
 
@@ -62,6 +65,9 @@ glib-compile-schemas %{_datadir}/glib-2.0/schemas &> /dev/null || :
 %{_datadir}/glib-2.0/schemas/org.gnome.SimpleScan.gschema.xml
 
 %changelog
+* Tue Apr 25 2017 David King <amigadave@amigadave.com> - 3.25.1-1
+- Update to 3.25.1
+
 * Mon Mar 20 2017 David King <amigadave@amigadave.com> - 3.24.0-1
 - Update to 3.24.0
 
diff --git a/sources b/sources
index 8ef6bd9..8d48f51 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (simple-scan-3.24.0.tar.xz) = 3abbbe5af4411b7900e0703ed0c281ab14b822558c08fac584f417ca9adc501725604a31675b370be1890be91d103bcb8b3e21d75c7c0086289a101624b30f8b
+SHA512 (simple-scan-3.25.1.tar.xz) = cd0166aa6dc0d0357180f7bd730463138be3b5f00b9e5f5b42e44b63460985696a8f06c84a2f02844f1a5e083b95628a013b588cb4d7b7ddfcac02865bf04b64