diff --git a/lib/Makefile.Watcom b/lib/Makefile.Watcom
index a698f9967..4478d254f 100644
--- a/lib/Makefile.Watcom
+++ b/lib/Makefile.Watcom
@@ -54,6 +54,7 @@ OBJS = $(OBJ_DIR)\base64.obj           $(OBJ_DIR)\connect.obj     &
        $(OBJ_DIR)\mprintf.obj          $(OBJ_DIR)\multi.obj       &
        $(OBJ_DIR)\netrc.obj            $(OBJ_DIR)\parsedate.obj   &
        $(OBJ_DIR)\progress.obj         $(OBJ_DIR)\security.obj    &
+       $(OBJ_DIR)\rawstr.obj           $(OBJ_DIR)\rawstr.obj    &
        $(OBJ_DIR)\select.obj           $(OBJ_DIR)\sendf.obj       &
        $(OBJ_DIR)\share.obj            $(OBJ_DIR)\socks.obj       &
        $(OBJ_DIR)\speedcheck.obj       $(OBJ_DIR)\splay.obj       &
@@ -503,3 +504,9 @@ $(OBJ_DIR)\nss.obj: nss.c setup.h config-win32.h ..\include\curl\curlbuild.h &
   strequal.h select.h sslgen.h ..\include\curl\mprintf.h
 $(OBJ_DIR)\qssl.obj: qssl.c setup.h config-win32.h ..\include\curl\curlbuild.h &
   ..\include\curl\curlrules.h setup_once.h
+$(OBJ_DIR)\rawstr.obj: rawstr.c setup.h config-win32.h ..\include\curl\curlbuild.h &
+  ..\include\curl\curlrules.h setup_once.h ..\include\curl\curl.h &
+  ..\include\curl\curlver.h ..\include\curl\curlrules.h &
+  ..\include\curl\easy.h ..\include\curl\multi.h ..\include\curl\curl.h &
+  strerror.h urldata.h cookie.h formdata.h timeval.h http_chunks.h &
+  hostip.h hash.h llist.h splay.h ..\include\curl\mprintf.h
diff --git a/lib/Makefile.riscos b/lib/Makefile.riscos
index ef758b4fb..0304b4558 100644
--- a/lib/Makefile.riscos
+++ b/lib/Makefile.riscos
@@ -12,7 +12,8 @@ objs =	o.base64 o.connect o.cookie o.dict \
 	o.memdebug o.mprintf o.netrc o.parsedate o.progress \
 	o.security o.select o.sendf o.speedcheck o.ssluse \
 	o.strequal o.strtok o.telnet o.timeval \
-	o.transfer o.url o.version o.strtoofft o.sslgen o.gtls
+	o.transfer o.url o.version o.strtoofft o.sslgen o.gtls \
+	o.rawstr
 
 # Compile options:
 linkopts	= -o libcurl
@@ -128,6 +129,9 @@ o.sslgen:	c.sslgen
 o.ssluse:	c.ssluse
 		gcc $(compileropts) -c -o ssluse.o c.ssluse
 
+o.rawstr:	c.rawstr
+		gcc $(compileropts) -c -o rawstr.o c.rawstr
+
 o.strequal:	c.strequal
 		gcc $(compileropts) -c -o strequal.o c.strequal
 
diff --git a/lib/Makefile.vc6 b/lib/Makefile.vc6
index 5652cb499..f559218a5 100644
--- a/lib/Makefile.vc6
+++ b/lib/Makefile.vc6
@@ -481,6 +481,7 @@ X_OBJS= \
 	$(DIROBJ)\tftp.obj \
 	$(DIROBJ)\splay.obj \
 	$(DIROBJ)\socks.obj \
+	$(DIROBJ)\rawstr.obj \
 	$(RESOURCE)
 
 all : $(TARGET)
diff --git a/lib/libcurl.framework.make b/lib/libcurl.framework.make
index f37df3ec4..628964231 100644
--- a/lib/libcurl.framework.make
+++ b/lib/libcurl.framework.make
@@ -10,7 +10,7 @@ SDK = /Developer/SDKs/MacOSX10.4u.sdk
 # Sets the minimum OSX version where the framework will work.
 ENVP = MACOSX_DEPLOYMENT_TARGET=10.3
 
-# for debug symbols add the -g option.  Remove the -O2 option for best debuggin.
+# for debug symbols add the -g option.  Remove the -O2 option for best debugging.
 # Can be compiled with -O3 optimizations.
 C_OPTIONS = -isysroot $(SDK) \
 	-fno-common \
@@ -83,6 +83,7 @@ OBJECTS = $(TMP_DIR)/base64.o \
 	$(TMP_DIR)/netrc.o \
 	$(TMP_DIR)/parsedate.o \
 	$(TMP_DIR)/progress.o \
+	$(TMP_DIR)/rawstr.o \
 	$(TMP_DIR)/security.o \
 	$(TMP_DIR)/select.o \
 	$(TMP_DIR)/sendf.o \
diff --git a/lib/makefile.amiga b/lib/makefile.amiga
index 49cb80cf1..e2ba6a83e 100644
--- a/lib/makefile.amiga
+++ b/lib/makefile.amiga
@@ -17,7 +17,7 @@ OBJS = amigaos.c base64.c connect.c content_encoding.c cookie.c dict.c easy.c \
 	ldap.c llist.c md5.c memdebug.c mprintf.c multi.c netrc.c parsedate.c \
 	progress.c security.c select.c sendf.c share.c speedcheck.c ssluse.c  \
 	strequal.c strtok.c telnet.c timeval.c transfer.c url.c version.c \
-	sslgen.c gtls.c strerror.c
+	sslgen.c gtls.c strerror.c rawstr.c
 
 all:	$(OBJS:.c=.o)
 	ar cru libcurl.a $(OBJS:.c=.o)
diff --git a/packages/Symbian/group/libcurl.mmp b/packages/Symbian/group/libcurl.mmp
index ef2aa0f1f..7cc421ec9 100644
--- a/packages/Symbian/group/libcurl.mmp
+++ b/packages/Symbian/group/libcurl.mmp
@@ -19,7 +19,7 @@ SOURCE \
   http_negotiate.c http_ntlm.c inet_pton.c strtoofft.c strerror.c   \
   hostares.c hostasyn.c hostip4.c hostip6.c hostsyn.c hostthre.c    \
   inet_ntop.c parsedate.c select.c gtls.c sslgen.c tftp.c splay.c   \
-  strdup.c socks.c ssh.c nss.c qssl.c
+  strdup.c socks.c ssh.c nss.c qssl.c rawstr.c
 
 USERINCLUDE   ../../../lib