diff -ruN VDR.org/PLUGINS/src/wapd-0.7a/server.c VDR/PLUGINS/src/wapd-0.7a/server.c
--- VDR.org/PLUGINS/src/wapd-0.7a/server.c	2005-11-06 19:07:11.000000000 +0100
+++ VDR/PLUGINS/src/wapd-0.7a/server.c	2005-11-06 19:09:39.000000000 +0100
@@ -19,6 +19,9 @@
 #include "server.h"
 #include "tools.h"
 #include "i18n.h"
+#if VDRVERSNUM >= 10331
+#include <vdr/device.h>
+#endif
 
 #define MAXLINES                   10
 
@@ -229,7 +232,11 @@
   if (Option("settings")) {
      unurilize(getopt);
      cChannel ch;
+#if VDRVERSNUM > 10323
+     if (ch.Parse(getopt)) {
+#else
      if (ch.Parse(getopt, true)) {
+#endif
         if (nr) {
            cChannel *channel = Channels.GetByNumber(nr);
            if (Channels.HasUniqueChannelID(&ch, channel)) {
@@ -481,7 +488,11 @@
            flags = timer->Active() ? 1 : 0;
 #endif
            channel_nr = timer->Channel()->Number();
+#if VDRVERSNUM > 10322
+           day = strdup(timer->PrintDay(timer->Day(), 0));
+#else
            day = strdup(timer->PrintDay(timer->Day()));
+#endif
            start = timer->Start();
            stop = timer->Stop();
            priority = timer->Priority();
@@ -505,7 +516,7 @@
      wmltr("Stop"), base, stop / 100, stop %100,
      wmltr("Priority"), base, priority,
      wmltr("Lifetime"), base, lifetime,
-     wmltr("File"), base, file);
+     wmltr("File"), base, wmlescape(file));
   if (timer)
      ReplyBuffer(WML_END(WML_DO("%s", URI_MAIN) WML_ENDDO()
         WML_DO("%s", URI_TIMERS) WML_ENDDO()
@@ -545,8 +556,13 @@
            int level = recording->HierarchyLevels();
            char *title = wmlescape(strdup(recording->Title(' ', false, level)));
            ReplyBuffer("%s" WML_BR(), title);
+#if VDRVERSNUM > 10324
+           if (recording->Info()->Description()) {
+              char *sum = wmlescape(strdup(recording->Info()->Description()));
+#else
            if (recording->Summary()) {
               char *sum = wmlescape(strdup(recording->Summary()));
+#endif
               char *tok;
               char *subtitle = strtok_r(sum, "\n", &tok);
               subtitle = strtok_r(NULL, "\n", &tok);
@@ -957,7 +973,11 @@
                  timer->Stop() % 100,
                  timer->Channel()->Number(),
 #if VDRVERSNUM >= 10318
+#if VDRVERSNUM > 10322
+                 *timer->PrintDay(timer->Day(), 0),
+#else
                  *timer->PrintDay(timer->Day()),
+#endif
 #else
                  timer->PrintDay(timer->Day()),
 #endif
diff -ruN VDR.org/PLUGINS/src/wapd-0.7a/server.h VDR/PLUGINS/src/wapd-0.7a/server.h
--- VDR.org/PLUGINS/src/wapd-0.7a/server.h	2005-11-06 19:07:11.000000000 +0100
+++ VDR/PLUGINS/src/wapd-0.7a/server.h	2005-11-06 19:10:18.000000000 +0100
@@ -19,6 +19,10 @@
 
 #define WMLBUFFER   3*MAXPARSEBUFFER
 
+#if VDRVERSNUM >= 10336
+#define MAXPARSEBUFFER KILOBYTE(10)
+#endif
+
 class cWapServer : cThread {
 private:
   enum eMethod { mUnknown, mGet, mPost };