diff --git a/m_evolution.sh.in b/m_evolution.sh.in
index e0c02cb..29fed4d 100644
--- a/m_evolution.sh.in
+++ b/m_evolution.sh.in
@@ -28,10 +28,10 @@
 m_evolution_query ()
 {
     AWK=@AWK@
-    EVOLUTION_ADDRESSBOOK_EXPORT=@EVOLUTION_ADDRESSBOOK_EXPORT@
+    EVOLUTION_ADDRESSBOOK_EXPORT=''
 
     if [ "$EVOLUTION_ADDRESSBOOK_EXPORT" = "auto" ]; then
-	for e in /usr/lib/evolution/*/evolution-addressbook-export
+	for e in /usr/libexec/evolution/*/evolution-addressbook-export
 	do
 	    if [ -x $e ]; then
 		EVOLUTION_ADDRESSBOOK_EXPORT=$e
@@ -39,7 +39,14 @@ m_evolution_query ()
 	done
     fi
 
-    if [ -x $EVOLUTION_ADDRESSBOOK_EXPORT ]; then
+    for i in @EVOLUTION_ADDRESSBOOK_EXPORT@; do
+	if [ -x "$i" ]; then
+	    EVOLUTION_ADDRESSBOOK_EXPORT="$i"
+	    break;
+	fi
+    done
+
+    if [ -x "$EVOLUTION_ADDRESSBOOK_EXPORT" ]; then
         $EVOLUTION_ADDRESSBOOK_EXPORT 2>/dev/null \
         | $AWK 'BEGIN {
                     FS = ":"