diff --git a/srcpkgs/caja/patches/cross-strftime.patch b/srcpkgs/caja/patches/cross-strftime.patch
new file mode 100644
index 00000000000..fb2557721bf
--- /dev/null
+++ b/srcpkgs/caja/patches/cross-strftime.patch
@@ -0,0 +1,40 @@
+--- configure.ac.orig	2015-10-23 14:18:17.868326070 +0200
++++ configure.ac	2015-10-23 14:20:17.736065420 +0200
+@@ -294,20 +294,29 @@ dnl ====================================
+ 
+ dnl strftime checks
+ 
+-AC_TRY_RUN([#include <time.h>
+-                int main ()
++AC_CACHE_CHECK([Define if strftime supports %E and %O modifiers], ac_cv_strftime_extensions,
++  [AC_TRY_RUN([
++   #include <string.h>
++   #include <time.h>
++    int
++    main (int argc, char **argv)
+                 {
+-                  char buf[100];
+-                  struct tm tm = {0};
+-                  tm.tm_year = 99;
+-                  if (strftime(buf, 100, "%EY", &tm) == 4 &&
+-                      strcmp (buf, "1999")==0)
++       struct tm tm;
++       char      buffer[16];
++       tm.tm_year = 81;
++       if (strftime (buffer, 16, "%EY", &tm) == 4 && strcmp (buffer, "1981") == 0)
+                     return 0;
+                   return 1;
+                 }
+             ],
+-    AC_DEFINE(HAVE_STRFTIME_EXTENSION, 1, [Define if strftime supports %E and %O modifiers.])
++  ac_cv_strftime_extensions=yes,
++  ac_cv_strftime_extensions=no,
++  [AC_MSG_ERROR([cross-compiling, preset ac_cv_strftime_extensions=yes/no])]
++  )]
+ )
++if test x"$ac_cv_strftime_extensions" = x"yes"; then
++    AC_DEFINE(HAVE_STRFTIME_EXTENSION, 1, [Define if strftime supports %E and %O modifiers.])
++fi
+ 
+ dnl ===========================================================================
+ 
diff --git a/srcpkgs/caja/template b/srcpkgs/caja/template
index 475df1bbebf..50799dc0b65 100644
--- a/srcpkgs/caja/template
+++ b/srcpkgs/caja/template
@@ -1,12 +1,13 @@
 # Template file for 'caja'
 pkgname=caja
 version=1.10.4
-revision=1
+revision=2
 build_pie=yes
 build_style=gnu-configure
 configure_args="--with-gtk=2.0 --disable-static --enable-unique
  --disable-update-mimedb $(vopt_enable gir introspection)"
-hostmakedepends="pkg-config intltool itstool glib-devel $(vopt_if gir gobject-introspection)"
+hostmakedepends="automake libtool gettext-devel pkg-config
+ intltool itstool glib-devel gobject-introspection"
 makedepends="pangox-compat-devel gtk+-devel dbus-devel exempi-devel libexif-devel
  libXt-devel mate-desktop-devel startup-notification-devel gvfs-devel libxml2-devel
  libunique1-devel"
@@ -23,6 +24,10 @@ if [ -z "$CROSS_BUILD" ]; then
 	build_options_default="gir"
 fi
 
+pre_configure() {
+	autoreconf -fi
+}
+
 libcaja_package() {
 	short_desc+=" - runtime library"
 	pkg_install() {