diff --git a/srcpkgs/caja/patches/cross-strftime.patch b/srcpkgs/caja/patches/cross-strftime.patch
index fb2557721bf..69ecd941047 100644
--- a/srcpkgs/caja/patches/cross-strftime.patch
+++ b/srcpkgs/caja/patches/cross-strftime.patch
@@ -1,40 +1,27 @@
---- 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 ====================================
+--- configure.ac	2019-02-24 16:19:09.000000000 +0100
++++ configure.ac	2019-04-30 01:25:54.026742335 +0200
+@@ -261,22 +261,8 @@
  
- dnl strftime checks
+ 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;
-                 }
-             ],
+-                    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 Void strftime(3) supports %E and %O
++AC_DEFINE(HAVE_STRFTIME_EXTENSION, 1, [Define if strftime supports %E and %O modifiers.])
  
- dnl ===========================================================================
+ dnl ==========================================================================
  
diff --git a/srcpkgs/caja/template b/srcpkgs/caja/template
index dfc6ce01185..b5d7f637479 100644
--- a/srcpkgs/caja/template
+++ b/srcpkgs/caja/template
@@ -3,13 +3,15 @@ pkgname=caja
 version=1.22.0
 revision=1
 build_style=gnu-configure
+build_helper="gir"
 configure_args="--disable-static --disable-packagekit --disable-schemas-compile
- --disable-update-mimedb $(vopt_enable gir introspection)"
-hostmakedepends="pkg-config intltool itstool glib-devel gobject-introspection"
-makedepends="gtk+3-devel dbus-devel exempi-devel libexif-devel libXt-devel
- mate-desktop-devel startup-notification-devel gvfs-devel libxml2-devel
- libnotify-devel"
-depends="dbus desktop-file-utils gvfs mate-desktop mate-icon-theme"
+ --disable-update-mimedb $(vopt_enable gir introspection)
+ ac_cv_lib_selinux_is_selinux_enabled=no ac_cv_strftime_extensions=yes"
+hostmakedepends="automake gettext-devel glib-devel gobject-introspection
+ intltool itstool libtool pkg-config"
+makedepends="exempi-devel gvfs-devel libXt-devel libexif-devel libnotify-devel
+ mate-desktop-devel"
+depends="dbus gvfs mate-desktop mate-icon-theme"
 short_desc="MATE shell and file manager"
 maintainer="Juan RP <xtraeme@voidlinux.org>"
 license="GPL-2.0-or-later"
@@ -17,12 +19,12 @@ homepage="https://mate-desktop.org"
 distfiles="https://pub.mate-desktop.org/releases/${version%.*}/${pkgname}-${version}.tar.xz"
 checksum=f4b17d96acfffc88b6e072819704b19dd4166e908cbd56c9fde5c67d70b2a993
 
-nocross="runs target binary to check for programs"
-
 build_options="gir"
-if [ -z "$CROSS_BUILD" ]; then
-	build_options_default="gir"
-fi
+build_options_default="gir"
+
+pre_configure() {
+	autoreconf -fi
+}
 
 libcaja_package() {
 	short_desc+=" - runtime library"