diff --git a/srcpkgs/midori/patches/execinfo-detect.patch b/srcpkgs/midori/patches/execinfo-detect.patch
new file mode 100644
index 0000000000..1fdeac5502
--- /dev/null
+++ b/srcpkgs/midori/patches/execinfo-detect.patch
@@ -0,0 +1,18 @@
+--- CMakeLists.txt.orig	2014-04-21 08:00:30.090231380 +0000
++++ CMakeLists.txt	2014-04-21 08:02:48.048579861 +0000
+@@ -102,13 +102,8 @@
+ endif ()
+ 
+ # Check if execinfo.h header exists
+-string(FIND ${CMAKE_SYSTEM_NAME} "BSD" BEGIN)
+-if (${BEGIN} GREATER 0)
+-    string(SUBSTRING ${CMAKE_SYSTEM_NAME} ${BEGIN} 3 BSD)
+-else()
+-    set(BSD 0)
+-endif()
+-if (UNIX AND NOT BSD AND NOT DFLY)
++find_file (EXECINFO execinfo.h)
++if (EXECINFO)
+     set(VALAFLAGS ${VALAFLAGS} -D HAVE_EXECINFO_H)
+ endif ()
+ 
diff --git a/srcpkgs/midori/template b/srcpkgs/midori/template
index 687f0006dd..c5958c778d 100644
--- a/srcpkgs/midori/template
+++ b/srcpkgs/midori/template
@@ -1,14 +1,15 @@
 # Template file for 'midori'
 pkgname=midori
 version=0.5.10
-revision=1
+revision=2
 create_wrksrc=yes
 lib32disabled=yes
+build_options="zeitgeist"
 build_style=cmake
-configure_args="-DUSE_GTK3=1 -DUSE_ZEITGEIST=1"
+configure_args="-DUSE_GTK3=1 $(vopt_if zeitgeist '-DUSE_ZEITGEIST=1' '-DUSE_ZEITGEIST=0')"
 hostmakedepends="pkg-config intltool librsvg-utils cmake glib-devel
  vala-devel libzeitgeist-devel"
-makedepends="gtk+3-devel libxml2-devel vala-devel libzeitgeist-devel
+makedepends="gtk+3-devel libxml2-devel vala-devel $(vopt_if zeitgeist zeitgeist-devel)
  dbus-glib-devel librsvg-devel libnotify-devel libsoup-gnome-devel
  webkitgtk-devel sqlite-devel libunique-devel libXScrnSaver-devel gcr-devel"
 depends="hicolor-icon-theme desktop-file-utils"