diff -urp webfm/js/webfm.js webfm/js/webfm.js
--- webfm/js/webfm.js
+++ webfm/js/webfm.js
@@ -2118,11 +2118,11 @@ Webfm.metadata.prototype.submitMeta = fu
     var output = "";
     for(var i = 0; i < input_num; i++) {
       if(inputs[i].value)
-        output += encodeURIComponent(inputs[i].name) + ":" + encodeURIComponent(Webfm.trim(inputs[i].value)) + ",";
+        output += encodeURIComponent(inputs[i].name) + ":" + encodeURIComponent(Webfm.trim(inputs[i].value)) + "~";
     }
     for(i = 0; i < textareas.length; i++) {
       if(textareas[i].value)
-        output += encodeURIComponent(textareas[i].name) + ":" + encodeURIComponent(Webfm.trim(textareas[i].value)) + ",";
+        output += encodeURIComponent(textareas[i].name) + ":" + encodeURIComponent(Webfm.trim(textareas[i].value)) + "~";
     }
     if(output.length) {
       Webfm.progressObj.show(Webfm.js_msg["work"],  "blue");
diff -urp webfm/webfm.module webfm/webfm.module
--- webfm/webfm.module
+++ webfm/webfm.module
@@ -2103,7 +2103,7 @@ function webfm_putmeta($fid, $metadata, 
   }
   if(($file = webfm_get_file_record($fid)) != false) {
     if($user == 1 || $user == $file->uid) {
-      $fields = explode(',',$metadata);
+      $fields = explode('~',$metadata);
       $metadata = array();
       foreach($fields as $field) {
         // Parse webfm_file_key/metadata pairs