diff --git a/src/mnemonics/electrum-words.cpp b/src/mnemonics/electrum-words.cpp
index d48df143..d1cef443 100644
--- a/src/mnemonics/electrum-words.cpp
+++ b/src/mnemonics/electrum-words.cpp
@@ -94,6 +94,11 @@ namespace
     std::string word;
     while (input_stream >> word)
     {
+      if (word.length() == 0 || word[0] == '#')
+      {
+        // Skip empty and comment lines
+        continue;
+      }
       words_array.push_back(word);
       if (has_checksum)
       {
diff --git a/src/mnemonics/wordlists/languages/english b/src/mnemonics/wordlists/languages/english
index 942040ed..714f66da 100644
--- a/src/mnemonics/wordlists/languages/english
+++ b/src/mnemonics/wordlists/languages/english
@@ -1,3 +1,4 @@
+# Originally created as part of the Electrum project, Copyright (C) 2014 Thomas Voegtlin
 abandon
 ability
 able
diff --git a/src/mnemonics/wordlists/languages/japanese b/src/mnemonics/wordlists/languages/japanese
index aa7673fc..cb28b89d 100644
--- a/src/mnemonics/wordlists/languages/japanese
+++ b/src/mnemonics/wordlists/languages/japanese
@@ -1,3 +1,4 @@
+# Originally created as part of the Electrum project, Copyright (C) 2014 Thomas Voegtlin
 あい
 あいこくしん
 あう
diff --git a/src/mnemonics/wordlists/languages/spanish b/src/mnemonics/wordlists/languages/spanish
index d0900c2c..29f5b3a7 100644
--- a/src/mnemonics/wordlists/languages/spanish
+++ b/src/mnemonics/wordlists/languages/spanish
@@ -1,3 +1,4 @@
+# Originally created as part of the Electrum project, Copyright (C) 2014 Thomas Voegtlin
 ábaco
 abdomen
 abeja