diff --git a/rxvt-unicode/.md5sum b/rxvt-unicode/.md5sum
index ab7706b58..cfc995192 100644
--- a/rxvt-unicode/.md5sum
+++ b/rxvt-unicode/.md5sum
@@ -1 +1,2 @@
 4cb9330e99fc0b0b05cebf3581557dd8  rxvt-unicode-9.06.tar.bz2
+940e229ecf98f4d9b10b231ae56a621f  rxvt-unicode.diff
diff --git a/rxvt-unicode/Pkgfile b/rxvt-unicode/Pkgfile
index db08ed502..6b746d26f 100644
--- a/rxvt-unicode/Pkgfile
+++ b/rxvt-unicode/Pkgfile
@@ -5,12 +5,15 @@
 
 name=rxvt-unicode
 version=9.06
-release=1
-source=(http://dist.schmorp.de/$name/Attic/$name-$version.tar.bz2)
+release=2
+source=(http://dist.schmorp.de/$name/Attic/$name-$version.tar.bz2
+        $name.diff)
 
 build() {
 	cd $name-$version
 
+	patch -p1 -i $SRC/$name.diff
+
 	./configure --prefix=/usr --mandir=/usr/man \
 	            --enable-utmp --enable-wtmp \
 	            --enable-transparency --enable-tinting --enable-fading \
diff --git a/rxvt-unicode/rxvt-unicode.diff b/rxvt-unicode/rxvt-unicode.diff
new file mode 100644
index 000000000..12f758298
--- /dev/null
+++ b/rxvt-unicode/rxvt-unicode.diff
@@ -0,0 +1,40 @@
+diff -aur rxvt-unicode-9.06.orig/src/command.C rxvt-unicode-9.06/src/command.C
+--- rxvt-unicode-9.06.orig/src/command.C	2008-11-05 17:21:05.000000000 +0100
++++ rxvt-unicode-9.06/src/command.C	2009-06-11 17:15:20.825550518 +0200
+@@ -3336,7 +3336,7 @@
+           }
+         else
+           {
+-            char *eq = strchr (str, '='); // constness lost, but verified to be ok
++            char *eq = (char*)strchr (str, '='); // constness lost, but verified to be ok
+ 
+             if (eq)
+               {
+diff -aur rxvt-unicode-9.06.orig/src/misc.C rxvt-unicode-9.06/src/misc.C
+--- rxvt-unicode-9.06.orig/src/misc.C	2008-04-26 04:57:18.000000000 +0200
++++ rxvt-unicode-9.06/src/misc.C	2009-06-11 17:16:35.493541260 +0200
+@@ -167,10 +167,10 @@
+   return r;
+ }
+ 
+-char *
++const char *
+ rxvt_basename (const char *str) NOTHROW
+ {
+-  char *base = strrchr (str, '/');
++  const char *base = strrchr (str, '/');
+ 
+   return (char *) (base ? base + 1 : str);
+ }
+diff -aur rxvt-unicode-9.06.orig/src/rxvt.h rxvt-unicode-9.06/src/rxvt.h
+--- rxvt-unicode-9.06.orig/src/rxvt.h	2008-11-05 16:42:03.000000000 +0100
++++ rxvt-unicode-9.06/src/rxvt.h	2009-06-11 17:16:53.117541300 +0200
+@@ -153,7 +153,7 @@
+ char *           rxvt_wcstoutf8                   (const wchar_t *str, int len = -1);
+ wchar_t *        rxvt_utf8towcs                   (const char *str, int len = -1);
+ 
+-char *           rxvt_basename                    (const char *str) NOTHROW;
++const char *     rxvt_basename                    (const char *str) NOTHROW;
+ void             rxvt_vlog                        (const char *fmt, va_list arg_ptr) NOTHROW;
+ void             rxvt_log                         (const char *fmt,...) NOTHROW;
+ void             rxvt_warn                        (const char *fmt,...) NOTHROW;