diff --git a/Library/Homebrew/tap_migrations.rb b/Library/Homebrew/tap_migrations.rb
index 4e7147cace..dcf56e10a8 100644
--- a/Library/Homebrew/tap_migrations.rb
+++ b/Library/Homebrew/tap_migrations.rb
@@ -5,33 +5,74 @@ TAP_MIGRATIONS = {
   "apple-gcc42" => "homebrew/dupes",
   "appledoc" => "homebrew/boneyard",
   "appswitch" => "homebrew/binary",
+  "atari++" => "homebrew/x11",
   "authexec" => "homebrew/boneyard",
   "aws-iam-tools" => "homebrew/boneyard",
   "blackbox" => "homebrew/boneyard",
+  "bochs" => "homebrew/x11",
   "boost149" => "homebrew/versions",
   "cantera" => "homebrew/science",
+  "cardpeek" => "homebrew/x11",
   "catdoc" => "homebrew/boneyard",
   "clam" => "homebrew/boneyard",
   "cloudfoundry-cli" => "pivotal/tap",
+  "clusterit" => "homebrew/x11",
   "cmucl" => "homebrew/binary",
   "comparepdf" => "homebrew/boneyard",
   "connect" => "homebrew/boneyard",
+  "curlftpfs" => "homebrew/x11",
+  "cwm" => "homebrew/x11",
   "dart" => "dart-lang/dart",
+  "ddd" => "homebrew/x11",
   "denyhosts" => "homebrew/boneyard",
+  "dmenu" => "homebrew/x11",
   "dotwrp" => "homebrew/science",
   "drizzle" => "homebrew/boneyard",
   "drush" => "homebrew/php",
   "dsniff" => "homebrew/boneyard",
+  "dwm" => "homebrew/x11",
+  "dzen2" => "homebrew/x11",
+  "easy-tag" => "homebrew/x11",
   "electric-fence" => "homebrew/boneyard",
   "fceux" => "homebrew/games",
+  "feh" => "homebrew/x11",
+  "fox" => "homebrew/x11",
+  "freeglut" => "homebrew/x11",
+  "freerdp" => "homebrew/x11",
+  "fsv" => "homebrew/x11",
+  "geany" => "homebrew/x11",
+  "geda-gaf" => "homebrew/x11",
+  "geeqie" => "homebrew/x11",
+  "geomview" => "homebrew/x11",
+  "gerbv" => "homebrew/x11",
+  "ggobi" => "homebrew/x11",
+  "giblib" => "homebrew/x11",
+  "gkrellm" => "homebrew/x11",
+  "glade" => "homebrew/x11",
+  "gle" => "homebrew/x11",
+  "gnumeric" => "homebrew/x11",
   "gnunet" => "homebrew/boneyard",
+  "gobby" => "homebrew/x11",
+  "gpredict" => "homebrew/x11",
+  "grace" => "homebrew/x11",
   "grads" => "homebrew/binary",
   "gromacs" => "homebrew/science",
+  "gsmartcontrol" => "homebrew/x11",
+  "gtk-chtheme" => "homebrew/x11",
+  "gtksourceviewmm" => "homebrew/x11",
+  "gtksourceviewmm3" => "homebrew/x11",
+  "gtkwave" => "homebrew/x11",
+  "gupnp-tools" => "homebrew/x11",
+  "hatari" => "homebrew/x11",
   "helios" => "spotify/public",
+  "hexchat" => "homebrew/x11",
   "hllib" => "homebrew/boneyard",
   "hugs98" => "homebrew/boneyard",
   "hwloc" => "homebrew/science",
+  "imake" => "homebrew/x11",
+  "inkscape" => "homebrew/x11",
   "ipopt" => "homebrew/science",
+  "iptux" => "homebrew/x11",
   "itsol" => "homebrew/science",
   "iulib" => "homebrew/boneyard",
   "jscoverage" => "homebrew/boneyard",
@@ -39,18 +80,26 @@ TAP_MIGRATIONS = {
   "jstalk" => "homebrew/boneyard",
   "justniffer" => "homebrew/boneyard",
   "kerl" => "homebrew/headonly",
+  "kernagic" => "homebrew/x11",
   "kismet" => "homebrew/boneyard",
+  "klavaro" => "homebrew/x11",
   "libdlna" => "homebrew/boneyard",
   "libgtextutils" => "homebrew/science",
   "librets" => "homebrew/boneyard",
   "libspotify" => "homebrew/binary",
   "lmutil" => "homebrew/binary",
+  "meld" => "homebrew/x11",
+  "mesalib-glw" => "homebrew/x11",
   "mess" => "homebrew/games",
   "metalua" => "homebrew/boneyard",
+  "mit-scheme" => "homebrew/x11",
   "mlkit" => "homebrew/boneyard",
   "mlton" => "homebrew/boneyard",
+  "morse" => "homebrew/x11",
   "mpio" => "homebrew/boneyard",
+  "mscgen" => "homebrew/x11",
   "msgpack-rpc" => "homebrew/boneyard",
+  "mupdf" => "homebrew/x11",
   "mydumper" => "homebrew/boneyard",
   "nlopt" => "homebrew/science",
   "octave" => "homebrew/science",
@@ -58,21 +107,55 @@ TAP_MIGRATIONS = {
   "openfst" => "homebrew/science",
   "opengrm-ngram" => "homebrew/science",
   "pan" => "homebrew/boneyard",
+  "pari" => "homebrew/x11",
+  "pcb" => "homebrew/x11",
+  "pdf2image" => "homebrew/x11",
+  "pdf2svg" => "homebrew/x11",
+  "pgplot" => "homebrew/x11",
+  "pixie" => "homebrew/x11",
   "pjsip" => "homebrew/boneyard",
   "pocl" => "homebrew/science",
+  "prooftree" => "homebrew/x11",
+  "py3cairo" => "homebrew/x11",
+  "pyxplot" => "homebrew/x11",
   "qfits" => "homebrew/boneyard",
   "qrupdate" => "homebrew/science",
+  "rdesktop" => "homebrew/x11",
+  "rxvt-unicode" => "homebrew/x11",
   "salt" => "homebrew/science",
+  "scantailor" => "homebrew/x11",
   "shark" => "homebrew/boneyard",
   "slicot" => "homebrew/science",
+  "smartsim" => "homebrew/x11",
   "solfege" => "homebrew/boneyard",
+  "sptk" => "homebrew/x11",
   "sundials" => "homebrew/science",
+  "swi-prolog" => "homebrew/x11",
+  "sxiv" => "homebrew/x11",
+  "sylpheed" => "homebrew/x11",
   "syslog-ng" => "homebrew/boneyard",
+  "tabbed" => "homebrew/x11",
+  "terminator" => "homebrew/x11",
   "tetgen" => "homebrew/science",
   "texmacs" => "homebrew/boneyard",
+  "tiger-vnc" => "homebrew/x11",
   "tmap" => "homebrew/boneyard",
+  "transmission-remote-gtk" => "homebrew/x11",
   "ume" => "homebrew/games",
+  "upnp-router-control" => "homebrew/x11",
   "urweb" => "homebrew/boneyard",
   "ushare" => "homebrew/boneyard",
+  "viewglob" => "homebrew/x11",
   "wkhtmltopdf" => "homebrew/boneyard",
+  "wmctrl" => "homebrew/x11",
+  "xchat" => "homebrew/x11",
+  "xclip" => "homebrew/x11",
+  "xdotool" => "homebrew/x11",
+  "xdu" => "homebrew/x11",
+  "xournal" => "homebrew/x11",
+  "xpa" => "homebrew/x11",
+  "xpdf" => "homebrew/x11",
+  "xplot" => "homebrew/x11",
+  "xspringies" => "homebrew/x11",
+  "yarp" => "homebrew/x11",
 }