diff --git a/chrome/content/zotero/webpagedump/domsaver.js b/chrome/content/zotero/webpagedump/domsaver.js
index 5802557d1..e2ff7d791 100644
--- a/chrome/content/zotero/webpagedump/domsaver.js
+++ b/chrome/content/zotero/webpagedump/domsaver.js
@@ -199,7 +199,7 @@ var wpdDOMSaver = {
 			// Changed by Dan for Zotero
 			"script": true, // no scripts
 
-			"encodeUTF8": false, // write the DOM Tree as UTF-8 and change the charset entry of the document
+			"encodeUTF8": true, // write the DOM Tree as UTF-8 and change the charset entry of the document
 			"metainfo": true, // include meta tags with URL and date/time information
 			"metacharset": false // if the meta charset is defined inside html override document charset
 			//"xtagging"    : true      // include a x tag around each word
diff --git a/chrome/content/zotero/xpcom/attachments.js b/chrome/content/zotero/xpcom/attachments.js
index 5e5b26e04..76fe34e7b 100644
--- a/chrome/content/zotero/xpcom/attachments.js
+++ b/chrome/content/zotero/xpcom/attachments.js
@@ -540,7 +540,7 @@ Zotero.Attachments = new function(){
 			mimeType = "application/pdf";
 		}
 		
-		var charsetID = Zotero.CharacterSets.getID(document.characterSet);
+		var charsetID = Zotero.CharacterSets.getID('utf-8'); // WPD will output UTF-8
 		
 		if (!forceTitle) {
 			// Remove e.g. " - Scaled (-17%)" from end of images saved from links,