diff --git a/forge-gui/src/main/java/forge/achievement/AchievementCollection.java b/forge-gui/src/main/java/forge/achievement/AchievementCollection.java
index d079f5ee129..3314ccbc9bc 100644
--- a/forge-gui/src/main/java/forge/achievement/AchievementCollection.java
+++ b/forge-gui/src/main/java/forge/achievement/AchievementCollection.java
@@ -126,6 +126,8 @@ public abstract class AchievementCollection implements Iterable<Achievement> {
             for (final String s : achievementListFile) {
                 if (!s.isEmpty()) {
                     String k[] = StringUtils.split(s, "|");
+                    if(k[0].contains("add(\""))
+                        k[0] = k[0].replace("add(\"","");
                     add(k[0],k[1],k[2]);
                 }
             }
diff --git a/forge-gui/src/main/java/forge/download/GuiDownloadService.java b/forge-gui/src/main/java/forge/download/GuiDownloadService.java
index c935779e296..411ce44fca1 100644
--- a/forge-gui/src/main/java/forge/download/GuiDownloadService.java
+++ b/forge-gui/src/main/java/forge/download/GuiDownloadService.java
@@ -242,7 +242,9 @@ public abstract class GuiDownloadService implements Runnable {
             count++;
             cardSkipped = true; //assume skipped unless saved successfully
             String url = kv.getValue();
-            final File fileDest = new File(kv.getKey());
+            //replace web url punctuation by their real punctuation...
+            String renamedKey = kv.getKey().replace("%2C",",").replace("%27s","'s");
+            final File fileDest = new File(renamedKey);
 
             System.out.println(count + "/" + totalCount + " - " + fileDest);
 
@@ -331,7 +333,7 @@ public abstract class GuiDownloadService implements Runnable {
 
     protected static void addMissingItems(Map<String, String> list, String nameUrlFile, String dir) {
         for (Pair<String, String> nameUrlPair : FileUtil.readNameUrlFile(nameUrlFile)) {
-            File f = new File(dir, nameUrlPair.getLeft());
+            File f = new File(dir, nameUrlPair.getLeft().replace("%2C",",").replace("%27s","'s"));
             //System.out.println(f.getAbsolutePath());
             if (!f.exists()) {
                 list.put(f.getAbsolutePath(), nameUrlPair.getRight());