diff --git a/CHANGES b/CHANGES
index 6037cd8..acfed10 100644
--- a/CHANGES
+++ b/CHANGES
@@ -2,6 +2,8 @@
   add textcode api for uuencode/uudecode, base64, quoted printable,
     url-encoding and yenc.
   implement fmt_uuencoded and scan_uuencoded.
+  implement fmt_base64, scan_base64.
+  implement fmt_quotedprintable, scan_quotedprintable
 
 0.11:
   fix fmt_long (didn't count the '-'), which in turn broke
diff --git a/t.c b/t.c
index aa407b4..4c42abd 100644
--- a/t.c
+++ b/t.c
@@ -17,6 +17,20 @@
      __asm__ __volatile__ ("rdtsc" : "=a" (low) : : "edx")
 
 int main(int argc,char* argv[]) {
+  char buf[100];
+  char buf2[100];
+  unsigned int len,len2;
+  buf[fmt_quotedprintable(buf,"zunächst einmal vielen Dank für die MUTT FAQ",44)]=0;
+  buffer_puts(buffer_1,buf);
+  buffer_putsflush(buffer_1,"\n");
+  if ((buf[len2=scan_quotedprintable(buf,buf2,&len)])!=0) {
+    buffer_putsflush(buffer_2,"parse error!\n");
+    return 1;
+  }
+  buffer_put(buffer_1,buf2,len2);
+  buffer_putsflush(buffer_1,"\n");
+  return 0;
+#if 0
   char buf[100];
   char buf2[100];
   unsigned int len,len2;
@@ -30,6 +44,7 @@ int main(int argc,char* argv[]) {
   buffer_put(buffer_1,buf2,len2);
   buffer_putsflush(buffer_1,"\n");
   return 0;
+#endif
 #if 0
   unsigned long size;
   char* buf=mmap_read(argv[1],&size);
diff --git a/textcode/fmt_quotedprintable.c b/textcode/fmt_quotedprintable.c
new file mode 100644
index 0000000..bb4997b
--- /dev/null
+++ b/textcode/fmt_quotedprintable.c
@@ -0,0 +1,25 @@
+#include "fmt.h"
+#include "textcode.h"
+#include "haveinline.h"
+
+static inline int tohex(char c) {
+  return c>9?c-10+'A':c+'0';
+}
+
+unsigned int fmt_quotedprintable(char* dest,const char* src,unsigned int len) {
+  register const unsigned char* s=(const unsigned char*) src;
+  unsigned long written=0,i;
+  for (i=0; i<len; ++i) {
+    if (s[i]&0x80 || s[i]=='=') {
+      if (dest) {
+	dest[written]='=';
+	dest[written+1]=tohex(s[i]>>4);
+	dest[written+2]=tohex(s[i]&15);
+      }
+      written+=3;
+    } else {
+      if (dest) dest[written]=s[i]; ++written;
+    }
+  }
+  return written;
+}
diff --git a/textcode/scan_quotedprintable.c b/textcode/scan_quotedprintable.c
new file mode 100644
index 0000000..1b30272
--- /dev/null
+++ b/textcode/scan_quotedprintable.c
@@ -0,0 +1,31 @@
+#include "fmt.h"
+#include "textcode.h"
+#include "haveinline.h"
+
+static inline int fromhex(char c) {
+  if (c>='0' && c<='9') return c-'0';
+  if (c>='A' && c<='F') return c-'A'+10;
+  if (c>='a' && c<='f') return c-'a'+10;
+  return -1;
+}
+
+unsigned int scan_quotedprintable(const char *src,char *dest,unsigned int *destlen) {
+  register const unsigned char* s=(const unsigned char*) src;
+  unsigned long written=0,i;
+  for (i=0; s[i]; ++i) {
+    if (s[i]=='=') {
+      int j=fromhex(s[i+1]);
+      if (j<0) break;
+      dest[written]=j<<4;
+      j=fromhex(s[i+2]);
+      if (j<0) break;
+      dest[written]|=j;
+      i+=2;
+    } else {
+      dest[written]=s[i];
+    }
+    ++written;
+  }
+  *destlen=written;
+  return i;
+}