diff --git a/ChangeLog b/ChangeLog
index 21db20ff151c52fa67f0abcc0d7b2062fbd1be90..af9c3f28384bcd4bc7313897a3eeaf7a5a6e0c0b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,14 @@
+Thu, 04 Feb 2016 20:31:38 +0100
+
+* Release v2.14.1
+    * Skip a small set of build tests on Debian and derivatives, since they
+      trigger a Debian/Imlib2 bug. See
+      <https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=812657> and
+      <https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=813729> for more
+      information
+    * Fix a segfault when combining --scale-down and --thumbnails on a
+      sufficiently large directory
+
 Sun, 04 Oct 2015 10:01:20 +0200
 
 * Release v2.14
diff --git a/man/feh.pre b/man/feh.pre
index fbb5a6eb57897d0b6dd68ab45a736b9cfa7c7591..01f51c20ace051ec0fe95dce7679a74aace69479 100644
--- a/man/feh.pre
+++ b/man/feh.pre
@@ -1691,6 +1691,15 @@ section.
 .
 .Pp
 .
+On some systems with Imlib2 1.4.7,
+.Nm
+may be unable to load gif images unless they are the only image in the
+filelist. This appears to be caused by a Debian and/or Imlib2 bug. See
+.Aq https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=813729
+for details.
+.
+.Pp
+.
 Thumbnail mode is somewhat inefficient, and because of that not nearly as fast
 as it could be.
 .
diff --git a/test/feh.t b/test/feh.t
index a9d2a04f68aa5e34253d45f125f15d1c2b8f52ef..d8e5e3fabd71223da6ff9c3f444da987af2dfe61 100644
--- a/test/feh.t
+++ b/test/feh.t
@@ -115,8 +115,18 @@ $cmd = Test::Command->new(
 	cmd => "$feh --list --recursive --sort filename test/ok" );
 
 $cmd->exit_is_num(0);
-$cmd->stdout_is_file('test/list/filename_recursive');
-$cmd->stderr_is_eq('');
+
+# https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=812657
+# https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=813729
+if ( -e '/etc/debian_version' and qx{imlib2-config --version} eq "1.4.7\n" ) {
+	# dummy tests to match number of planned tests
+	$cmd->exit_is_num(0);
+	$cmd->exit_is_num(0);
+}
+else {
+	$cmd->stdout_is_file('test/list/filename_recursive');
+	$cmd->stderr_is_eq('');
+}
 
 $cmd = Test::Command->new( cmd => "$feh --customlist '%f; %h; %l; %m; %n; %p; "
 	  . "%s; %t; %u; %w' $images" );