diff --git a/pcbnew/github/github_plugin.cpp b/pcbnew/github/github_plugin.cpp
index 9ef1448e4e..8da1683d15 100644
--- a/pcbnew/github/github_plugin.cpp
+++ b/pcbnew/github/github_plugin.cpp
@@ -52,6 +52,7 @@
 #include <pcb_parser.h>
 #include <class_board.h>
 #include <github_plugin.h>
+#include <class_module.h>
 
 using namespace std;
 
@@ -138,6 +139,11 @@ MODULE* GITHUB_PLUGIN::FootprintLoad( const wxString& aLibraryPath,
 
             MODULE* ret = (MODULE*) parser.Parse();
 
+            // Dude, the footprint name comes from the file name in
+            // a github library.  Zero out the library name, we don't know it here.
+            // Caller always has to set the library nickname if it knows it.
+            ret->SetFPID( fp_name );
+
             return ret;
         }
     }
diff --git a/pcbnew/io_mgr.cpp b/pcbnew/io_mgr.cpp
index fd1db3401c..a89e6c0da9 100644
--- a/pcbnew/io_mgr.cpp
+++ b/pcbnew/io_mgr.cpp
@@ -200,7 +200,7 @@ IO_MGR::PCB_FILE_T IO_MGR::GuessPluginTypeFromLibPath( const wxString& aLibPath
         ret = EAGLE;
     }
 
-    // Test this one anyways, even thought its the default guess, to avoid
+    // Test this one anyways, even though it's the default guess, to avoid
     // the wxURI instantiation below.
     // We default ret to KICAD above, because somebody might have
     // mistakenly put a pretty library into a directory other than