diff --git a/mail/qmail-autoresponder/qmail-autoresponder.conf b/mail/qmail-autoresponder/qmail-autoresponder.conf
index ac01aa78e..19c8df801 100644
--- a/mail/qmail-autoresponder/qmail-autoresponder.conf
+++ b/mail/qmail-autoresponder/qmail-autoresponder.conf
@@ -2,7 +2,7 @@
 # This copyright note is auto-generated by ./scripts/Create-CopyPatch.
 #
 # Filename: package/.../qmail-autoresponder/qmail-autoresponder.conf
-# Copyright (C) 2006 The OpenSDE Project
+# Copyright (C) 2006 - 2011 The OpenSDE Project
 # Copyright (C) 2006 The T2 SDE Project
 #
 # More information can be found in the files COPYING and README.
@@ -13,11 +13,12 @@
 # GNU General Public License can be found in the file COPYING.
 # --- SDE-COPYRIGHT-NOTE-END ---
 
-if ! pkginstalled mysql; then
-	var_append patchfiles ' ' $confdir/without-mysql.diff
-else
+if pkginstalled mysql; then
 	pkgprefix -t mysql
+	var_append patchfiles ' ' $confdir/with-mysql.diff
 	var_append GCC_WRAPPER_APPEND ' ' "-I$root$( pkgprefix includedir mysql )"
+else
+	var_append patchfiles ' ' $confdir/remove-mysql.diff
 fi
 
 pkg_qmailar_configure() {
@@ -25,5 +26,6 @@ pkg_qmailar_configure() {
 	echo $root$( pkgprefix libdir bglibs ) > conf-bglibs
 	echo $root$bindir > conf-bin
 	echo $root$mandir > conf-man
+	export PATH=$root$( pkgprefix bindir bglibs ):$PATH
 }
 hook_add premake 5 pkg_qmailar_configure
diff --git a/mail/qmail-autoresponder/qmail-autoresponder.desc b/mail/qmail-autoresponder/qmail-autoresponder.desc
index 8ce75b766..4b1d50ab2 100644
--- a/mail/qmail-autoresponder/qmail-autoresponder.desc
+++ b/mail/qmail-autoresponder/qmail-autoresponder.desc
@@ -3,7 +3,7 @@
 [COPY] This copyright note is auto-generated by ./scripts/Create-CopyPatch.
 [COPY]
 [COPY] Filename: package/.../qmail-autoresponder/qmail-autoresponder.desc
-[COPY] Copyright (C) 2006 The OpenSDE Project
+[COPY] Copyright (C) 2006 - 2011 The OpenSDE Project
 [COPY] Copyright (C) 2006 The T2 SDE Project
 [COPY]
 [COPY] More information can be found in the files COPYING and README.
@@ -42,8 +42,8 @@
 
 [L] GPL
 [S] Stable
-[V] 0.96.2
+[V] 0.97
 [P] O -----5---9 810.000
 
-[D] 4008934087 qmail-autoresponder-0.96.2.tar.gz http://untroubled.org/qmail-autoresponder/
+[D] 3426120990 qmail-autoresponder-0.97.tar.gz http://untroubled.org/qmail-autoresponder/
 
diff --git a/mail/qmail-autoresponder/remove-mysql.diff b/mail/qmail-autoresponder/remove-mysql.diff
new file mode 100644
index 000000000..ec291341d
--- /dev/null
+++ b/mail/qmail-autoresponder/remove-mysql.diff
@@ -0,0 +1,24 @@
+# --- SDE-COPYRIGHT-NOTE-BEGIN ---
+# This copyright note is auto-generated by ./scripts/Create-CopyPatch.
+#
+# Filename: package/.../qmail-autoresponder/remove-mysql.diff
+# Copyright (C) 2011 The OpenSDE Project
+#
+# More information can be found in the files COPYING and README.
+#
+# This patch file is dual-licensed. It is available under the license the
+# patched project is licensed under, as long as it is an OpenSource license
+# as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms
+# of the GNU General Public License as published by the Free Software
+# Foundation; either version 2 of the License, or (at your option) any later
+# version.
+# --- SDE-COPYRIGHT-NOTE-END ---
+
+diff -Naur qmail-autoresponder-0.97.orig/options.c qmail-autoresponder-0.97/options.c
+--- qmail-autoresponder-0.97.orig/options.c	2009-09-26 22:45:17.000000000 +0200
++++ qmail-autoresponder-0.97/options.c	2009-09-26 22:46:07.000000000 +0200
+@@ -1,4 +1,3 @@
+-#include <mysql/mysql.h>
+ #include <stdlib.h>
+ #include <string.h>
+ #include <str/str.h>
diff --git a/mail/qmail-autoresponder/with-mysql.diff b/mail/qmail-autoresponder/with-mysql.diff
new file mode 100644
index 000000000..ea3341058
--- /dev/null
+++ b/mail/qmail-autoresponder/with-mysql.diff
@@ -0,0 +1,30 @@
+# --- SDE-COPYRIGHT-NOTE-BEGIN ---
+# This copyright note is auto-generated by ./scripts/Create-CopyPatch.
+#
+# Filename: package/.../qmail-autoresponder/with-mysql.diff
+# Copyright (C) 2011 The OpenSDE Project
+# Copyright (C) 2006 The T2 SDE Project
+# Copyright (C) 1998 - 2004 Clifford Wolf
+#
+# More information can be found in the files COPYING and README.
+#
+# This patch file is dual-licensed. It is available under the license the
+# patched project is licensed under, as long as it is an OpenSource license
+# as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms
+# of the GNU General Public License as published by the Free Software
+# Foundation; either version 2 of the License, or (at your option) any later
+# version.
+# --- SDE-COPYRIGHT-NOTE-END ---
+
+--- ./Makefile.orig	2008-04-29 01:34:57.000000000 +0300
++++ ./Makefile	2011-04-15 19:26:12.712726486 +0300
+@@ -6,7 +6,7 @@
+ 
+ DEFAULT: all
+ 
+-all: libraries programs docs
++all: libraries programs mysql docs
+ 
+ clean: TARGETS
+ 	rm -f `cat TARGETS`
+
diff --git a/mail/qmail-autoresponder/without-mysql.diff b/mail/qmail-autoresponder/without-mysql.diff
deleted file mode 100644
index feae1b1d8..000000000
--- a/mail/qmail-autoresponder/without-mysql.diff
+++ /dev/null
@@ -1,38 +0,0 @@
-# --- SDE-COPYRIGHT-NOTE-BEGIN ---
-# This copyright note is auto-generated by ./scripts/Create-CopyPatch.
-#
-# Filename: package/.../qmail-autoresponder/without-mysql.diff
-# Copyright (C) 2006 The T2 SDE Project
-# Copyright (C) 1998 - 2004 Clifford Wolf
-#
-# More information can be found in the files COPYING and README.
-#
-# This patch file is dual-licensed. It is available under the license the
-# patched project is licensed under, as long as it is an OpenSource license
-# as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms
-# of the GNU General Public License as published by the Free Software
-# Foundation; either version 2 of the License, or (at your option) any later
-# version.
-# --- SDE-COPYRIGHT-NOTE-END ---
-
---- ./Makefile.orig	2004-05-06 19:52:42.000000000 -0400
-+++ ./Makefile	2004-05-06 19:52:54.000000000 -0400
-@@ -61,7 +61,7 @@
- main.o: compile main.c qmail-autoresponder.h
- 	./compile main.c
- 
--programs: qmail-autoresponder qmail-autoresponder-mysql
-+programs: qmail-autoresponder
- 
- qmail-autoresponder: load qmail-autoresponder.o main.o
- 	./load qmail-autoresponder main.o -lbg-iobuf -lbg-str
---- ./insthier.c.orig	2004-05-06 19:52:58.000000000 -0400
-+++ ./insthier.c	2004-05-06 19:53:03.000000000 -0400
-@@ -8,7 +8,6 @@
-   int man1;
- 
-   c(bin,  "qmail-autoresponder",       -1, -1, 0755);
--  c(bin,  "qmail-autoresponder-mysql", -1, -1, 0755);
- 
-   man1 = d(man, "man1", -1, -1, 0755);
-   c(man1, "qmail-autoresponder.1",     -1, -1, 0644);