diff --git a/src/update_engine/simple_key_value_store.cc b/src/update_engine/simple_key_value_store.cc
index eb6a952..a814fcc 100644
--- a/src/update_engine/simple_key_value_store.cc
+++ b/src/update_engine/simple_key_value_store.cc
@@ -27,7 +27,14 @@ map<std::string, std::string> ParseString(const string& str) {
     string::size_type pos = it->find('=');
     if (pos == string::npos)
       continue;
-    ret[it->substr(0, pos)] = it->substr(pos + 1);
+    string val = it->substr(pos + 1);
+    if ((val.length() > 2) &&
+      ((val.at(0) == '\"' && val.at(val.length() - 1) == '\"') ||
+      (val.at(0) == '\'' && val.at(val.length() - 1) == '\''))) {
+      val = val.substr(1, val.length() - 2);
+    }
+
+    ret[it->substr(0, pos)] = val;
   }
   return ret;
 }