diff --git a/content/base/src/nsDOMParser.cpp b/content/base/src/nsDOMParser.cpp
index 61e3ac907d35..4731d467bdc5 100644
--- a/content/base/src/nsDOMParser.cpp
+++ b/content/base/src/nsDOMParser.cpp
@@ -86,6 +86,7 @@ public:
 
 protected:
   nsCString mContentType;
+  nsCString mContentCharset;
   nsresult mStatus;
   PRInt32 mContentLength;
   nsCOMPtr<nsIURI> mURI;
@@ -194,12 +195,12 @@ NS_IMETHODIMP nsDOMParserChannel::SetContentType(const nsACString &aContentType)
 /* attribute ACString contentCharset; */
 NS_IMETHODIMP nsDOMParserChannel::GetContentCharset(nsACString &aContentCharset)
 {
-  aContentCharset.Truncate();
+  aContentCharset = mContentCharset;
   return NS_OK;
 }
 NS_IMETHODIMP nsDOMParserChannel::SetContentCharset(const nsACString &aContentCharset)
 {
-  return NS_ERROR_NOT_IMPLEMENTED;
+  mContentCharset = aContentCharset;
 }
 
 /* attribute long contentLength; */
@@ -547,6 +548,7 @@ nsDOMParser::ParseFromStream(nsIInputStream *stream,
   if (principal) {
     channel->SetOwner(principal);
   }
+  parserChannel->SetContentCharset(nsDependentCString(charset));
   nsCOMPtr<nsIRequest> request = NS_STATIC_CAST(nsIRequest*, parserChannel);
 
   // Tell the document to start loading