diff --git a/src/ChangeLog b/src/ChangeLog
index 6212c4039ad..459b5e284f2 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
+2009-08-28  Teodor Zlatanov  <tzz@lifelogs.com>
+
+	* print.c (print_object): Set escapeflag to 1 when printing
+	hashtable keys and values.
+
 2009-08-27  Stefan Monnier  <monnier@iro.umontreal.ca>
 
 	* lread.c (read_integer): Use doubles (and potentially return a float
diff --git a/src/print.c b/src/print.c
index 4a990f1cabb..7f526243346 100644
--- a/src/print.c
+++ b/src/print.c
@@ -2100,9 +2100,9 @@ print_object (obj, printcharfun, escapeflag)
 	    if (!NILP (HASH_HASH (h, i)))
 	      {
 		if (i) PRINTCHAR (' ');
-		print_object (HASH_KEY (h, i), printcharfun, 0);
+		print_object (HASH_KEY (h, i), printcharfun, 1);
 		PRINTCHAR (' ');
-		print_object (HASH_VALUE (h, i), printcharfun, 0);
+		print_object (HASH_VALUE (h, i), printcharfun, 1);
 	      }
 
 	  if (size < real_size)