diff --git a/zxing.appspot.com/src/com/google/zxing/web/generator/client/ContactInfoGenerator.java b/zxing.appspot.com/src/com/google/zxing/web/generator/client/ContactInfoGenerator.java
index 9297f1553..1592ece42 100644
--- a/zxing.appspot.com/src/com/google/zxing/web/generator/client/ContactInfoGenerator.java
+++ b/zxing.appspot.com/src/com/google/zxing/web/generator/client/ContactInfoGenerator.java
@@ -106,7 +106,7 @@ public final class ContactInfoGenerator implements GeneratorSource {
 
   private static void maybeAppendMECARD(StringBuilder output, String prefix, String value) {
     if (value.length() > 0) {
-      value = value.replaceAll("([:;])", "\\\\$1");
+      value = value.replaceAll("([\\\\:;])", "\\\\$1");
       value = value.replaceAll("\\n", "");
       output.append(prefix).append(':').append(value).append(';');
     }
diff --git a/zxing.appspot.com/src/com/google/zxing/web/generator/client/WifiGenerator.java b/zxing.appspot.com/src/com/google/zxing/web/generator/client/WifiGenerator.java
index debf4533d..503754bce 100644
--- a/zxing.appspot.com/src/com/google/zxing/web/generator/client/WifiGenerator.java
+++ b/zxing.appspot.com/src/com/google/zxing/web/generator/client/WifiGenerator.java
@@ -86,11 +86,7 @@ public final class WifiGenerator implements GeneratorSource {
     if (input.contains("\n")) {
       throw new GeneratorException(name + " field must not contain \\n characters.");
     }
-    input = input.replace(";", "\\;");
-    input = input.replace(":", "\\:");
-    input = input.replace("\\", "\\\\");
-    input = input.replace("/", "\\/");
-    return input;
+    return input.replaceAll("([\\\\:;])", "\\\\$1");
   }
   
   private String getSsidField() throws GeneratorException {
diff --git a/zxing.appspot.com/war/app.yaml b/zxing.appspot.com/war/app.yaml
index dca771988..c2a2e25ea 100644
--- a/zxing.appspot.com/war/app.yaml
+++ b/zxing.appspot.com/war/app.yaml
@@ -1,5 +1,5 @@
 application: zxing
-version: 4
+version: 5
 runtime: python
 api_version: 1