diff --git a/PKHeX.Core/Legality/Encounters/EncounterGenerator.cs b/PKHeX.Core/Legality/Encounters/EncounterGenerator.cs
index d7b609d93..79e2602b3 100644
--- a/PKHeX.Core/Legality/Encounters/EncounterGenerator.cs
+++ b/PKHeX.Core/Legality/Encounters/EncounterGenerator.cs
@@ -950,7 +950,13 @@ private static IEnumerable<MysteryGift> GetMatchingWC3(PKM pkm, IEnumerable<Myst
 
                 if (wc.Language != -1 && wc.Language != pkm.Language) continue;
                 if (wc.Ball != pkm.Ball) continue;
-                if (wc.Fateful != pkm.FatefulEncounter) continue;
+                if (wc.Fateful != pkm.FatefulEncounter)
+                {
+                    // XD Gifts only at level 20 get flagged after transfer
+                    bool valid = wc.Level == 20 && pkm is XK3;
+                    if (!valid)
+                        continue;
+                }
 
                 if (pkm.IsNative)
                 {
diff --git a/PKHeX.Core/Resources/byte/pcd.pkl b/PKHeX.Core/Resources/byte/pcd.pkl
index 94aa08d3a..9600ac8fc 100644
Binary files a/PKHeX.Core/Resources/byte/pcd.pkl and b/PKHeX.Core/Resources/byte/pcd.pkl differ
diff --git a/PKHeX.Core/Resources/byte/pgf.pkl b/PKHeX.Core/Resources/byte/pgf.pkl
index e360e14dc..6dbfa7cee 100644
Binary files a/PKHeX.Core/Resources/byte/pgf.pkl and b/PKHeX.Core/Resources/byte/pgf.pkl differ
diff --git a/PKHeX.Core/Resources/byte/wc6.pkl b/PKHeX.Core/Resources/byte/wc6.pkl
index 76fc7a6c9..363e51449 100644
Binary files a/PKHeX.Core/Resources/byte/wc6.pkl and b/PKHeX.Core/Resources/byte/wc6.pkl differ
diff --git a/PKHeX.Core/Resources/byte/wc7.pkl b/PKHeX.Core/Resources/byte/wc7.pkl
index dadfcb0af..feccf99bc 100644
Binary files a/PKHeX.Core/Resources/byte/wc7.pkl and b/PKHeX.Core/Resources/byte/wc7.pkl differ
diff --git a/PKHeX.Core/Resources/byte/wc7full.pkl b/PKHeX.Core/Resources/byte/wc7full.pkl
index 6c5b61fb9..ea5ff56ca 100644
Binary files a/PKHeX.Core/Resources/byte/wc7full.pkl and b/PKHeX.Core/Resources/byte/wc7full.pkl differ
diff --git a/PKHeX.WinForms/Resources/text/changelog.txt b/PKHeX.WinForms/Resources/text/changelog.txt
index 30edc9129..eeb81e9ce 100644
--- a/PKHeX.WinForms/Resources/text/changelog.txt
+++ b/PKHeX.WinForms/Resources/text/changelog.txt
@@ -1,7 +1,28 @@
 PKHeX - By Kaphotics
 http://projectpokemon.org/pkhex
 
-17/07/02 - New Update:
+17/08/07 - New Update:
+ - Legality:
+ - - Changed: XD/Colo PIDIV detection speed improved by a factor of ~8000x
+ - - Changed: Method# PIDIV detection speed improved by a factor of ~250x
+ - - Changed: Another round of legality check updates. Thanks (so many different users)!
+ - - Fixed: Pokewalker PID detection now recognizes PIDs correctly.
+ - - Fixed: Air Cutter switched with Roost in OR/AS tutor compatibility list. Thanks @architdate!
+ - - Changed: Updated Chinese translation files. Thanks @wwwwwwzx!
+ - - Added: Gen2 headbutt encounters are now checked for headbutt legality. Thanks @javierhimura!
+ - - Added: Transferring a pkm from XD to any other game will now receive a Fateful Encounter flag if appropriate.
+ - Added: WC3 (gen3 event template) -> pkm conversion. Use the Mystery Gift Database.
+ - Added: Ability to batch edit trash bytes (.Nickname_Trash=$[]43,00,...)
+ - Added: Inventory items can now be sorted by index number.
+ - Changed: Event Flag/Constant editor redesigned to separate tabs.
+ - Changed: Deoxys in Gen3 now shows up with the game-specific form.
+ - Fixed: Platinum special wallpapers now appear correctly. Thanks @sora10pls!
+ - Fixed: D/P current poketch app now loads correctly. Thanks @sora10pls!
+ - Fixed: D/P mail item inventory now loads correctly. Thanks @sora10pls!
+ - Fixed: Importing qr from url now behaves correctly. Thanks @ForcedToRock!
+ - Fixed: Battle Revolution data now loads correctly. Thanks Maddaren!
+
+17/07/02 - New Update: (47985) [634877]
  - Legality:
  - - Added: All-generation ribbon legality checks. Thanks White-Canary!
  - - Added: Strengthened PIDIV detection & enforcement for gen 3/4 encounters.
diff --git a/PKHeX.WinForms/Resources/text/version.txt b/PKHeX.WinForms/Resources/text/version.txt
index 2a66fd165..e02148551 100644
--- a/PKHeX.WinForms/Resources/text/version.txt
+++ b/PKHeX.WinForms/Resources/text/version.txt
@@ -1 +1 @@
-20170702
\ No newline at end of file
+20170807
\ No newline at end of file