diff --git a/debugger/Makefile.in b/debugger/Makefile.in
index 350c219..1aaaca1 100644
--- a/debugger/Makefile.in
+++ b/debugger/Makefile.in
@@ -1,4 +1,4 @@
-DEFS      = -D__WINE__ -DLIBDIR=\"$(libdir)\"
+DEFS      = -D__WINE__ -DLIBDIR="\"$(libdir)\""
 TOPSRCDIR = @top_srcdir@
 TOPOBJDIR = ..
 SRCDIR    = @srcdir@
diff --git a/debugger/debug.l b/debugger/debug.l
index 0c4bc8a..7dd2cb2 100644
--- a/debugger/debug.l
+++ b/debugger/debug.l
@@ -33,7 +33,7 @@
 
 DIGIT	   [0-9]
 HEXDIGIT   [0-9a-fA-F]
-FORMAT     [bcdiswx]
+FORMAT     [ubcdiswx]
 IDENTIFIER [_a-zA-Z\.~][_a-zA-Z0-9\.~@]*
 PATHNAME   [/_a-zA-Z\.~][/_a-zA-Z0-9\.~@]*
 STRING     \"[^\n"]+\"
diff --git a/debugger/memory.c b/debugger/memory.c
index aa1dd71..4d30b87 100644
--- a/debugger/memory.c
+++ b/debugger/memory.c
@@ -223,6 +223,19 @@
 
     switch(format)
     {
+	case 'u': {
+		WCHAR *ptr = (WCHAR*)pnt;
+		if (count == 1) count = 256;
+                while (count--)
+                {
+                    if (!DBG_CHECK_READ_PTR( &addr, sizeof(WCHAR) )) return;
+                    if (!*ptr) break;
+                    addr.off++;
+                    fputc( (char)*ptr++, stderr );
+                }
+		fprintf(stderr,"\n");
+		return;
+	    }
 	case 's':
 		if (count == 1) count = 256;
                 while (count--)