diff --git a/docs/CHANGES.txt b/docs/CHANGES.txt
index 0af0daa9f..780fdaeef 100644
--- a/docs/CHANGES.txt
+++ b/docs/CHANGES.txt
@@ -39,6 +39,9 @@ http://www.newbreedsoftware.com/tuxpaint/
   * Korean language file (ko.po) update.
     Mark K. Kim <tuxNO_SOLICITATIONpaint-dev@cbreak.org>
 
+  * Added support for native names for Dutch (nederlands),
+    Slovenian (slovensko) and Walloon (walon) in "--lang" option.
+
   * Fixed security issue with permissions to Tux Paint docs directory.
     Mark K. Kim <tuxNO_SOLICITATIONpaint-dev@cbreak.org>
 
diff --git a/docs/README.txt b/docs/README.txt
index fbd40af12..f76081772 100644
--- a/docs/README.txt
+++ b/docs/README.txt
@@ -9,7 +9,7 @@
                            bill@newbreedsoftware.com
                    http://www.newbreedsoftware.com/tuxpaint/
 
-                         June 14, 2002 - March 4, 2004
+                         June 14, 2002 - March 23, 2004
 
      ----------------------------------------------------------------------
 
@@ -382,7 +382,7 @@ Options
                      |--------------------+------------------+---------|
                      |danish              |dansk             |         |
                      |--------------------+------------------+---------|
-                     |dutch               |                  |         |
+                     |dutch               |nederlands        |         |
                      |--------------------+------------------+---------|
                      |finnish             |suomi             |         |
                      |--------------------+------------------+---------|
@@ -426,13 +426,15 @@ Options
                      |--------------------+------------------+---------|
                      |slovak              |                  |         |
                      |--------------------+------------------+---------|
+                     |slovenian           |slovensko         |         |
+                     |--------------------+------------------+---------|
                      |swedish             |svenska           |         |
                      |--------------------+------------------+---------|
                      |tamil               |                  |         |
                      |--------------------+------------------+---------|
                      |turkish             |                  |         |
                      |--------------------+------------------+---------|
-                     |walloon             |                  |         |
+                     |walloon             |walon             |         |
                      +-------------------------------------------------+
 
      ----------------------------------------------------------------------
@@ -630,10 +632,12 @@ Options
            |---------------+-------------------+--------------------|
            |sk_SK          |                   |Slovak              |
            |---------------+-------------------+--------------------|
-           |sv_SE@euro     |Svenska            |Swedish             |
+           |sl_SI          |                   |Slovenian           |
            |---------------+-------------------+--------------------|
            |sr_YU          |                   |Serbian             |
            |---------------+-------------------+--------------------|
+           |sv_SE@euro     |Svenska            |Swedish             |
+           |---------------+-------------------+--------------------|
            |ta_IN (*)      |                   |Tamil               |
            |---------------+-------------------+--------------------|
            |tr_TR@euro     |                   |Turkish             |
diff --git a/docs/html/README.html b/docs/html/README.html
index 57dc4bfb5..ac67deddf 100644
--- a/docs/html/README.html
+++ b/docs/html/README.html
@@ -23,7 +23,7 @@ New Breed Software</p>
 <p><a href="mailto:bill@newbreedsoftware.com">bill@newbreedsoftware.com</a><br>
 <a href="http://www.newbreedsoftware.com/tuxpaint/">http://www.newbreedsoftware.com/tuxpaint/</a></p>
 
-<p>June 14, 2002 - March 17, 2004</p>
+<p>June 14, 2002 - March 23, 2004</p>
 </center>
 
 <hr size=2 noshade>
@@ -515,7 +515,7 @@ New Breed Software</p>
 	  </tr>
 	  <tr>
 	    <td><code>dutch</code></td>
-	    <td>&nbsp;</td>
+	    <td><code>nederlands</code></td>
 	    <td>&nbsp;</td>
 	  </tr>
 	  <tr>
@@ -625,7 +625,7 @@ New Breed Software</p>
 	  </tr>
 	  <tr>
 	    <td><code>slovenian</code></td>
-	    <td>&nbsp;</td>
+	    <td><code>slovensko</code></td>
 	    <td>&nbsp;</td>
 	  </tr>
 	  <tr>
@@ -645,7 +645,7 @@ New Breed Software</p>
 	  </tr>
 	  <tr>
 	    <td><code>walloon</code></td>
-	    <td>&nbsp;</td>
+	    <td><code>walon</code></td>
 	    <td>&nbsp;</td>
 	  </tr>
 	  </table>
diff --git a/src/tuxpaint.c b/src/tuxpaint.c
index f62f69ef3..64f1c05ba 100644
--- a/src/tuxpaint.c
+++ b/src/tuxpaint.c
@@ -3794,7 +3794,7 @@ void show_lang_usage(FILE * f, char * prg)
 /* zh_CN */  "  chinese\n"
 /* cs */     "  czech        cesky\n"
 /* da */     "  danish       dansk\n"
-/* nl */     "  dutch\n"
+/* nl */     "  dutch        nederlands\n"
 /* fi */     "  finnish      suomi\n"
 /* fr */     "  french       francais\n"
 /* de */     "  german       deutsch\n"
@@ -3815,12 +3815,12 @@ void show_lang_usage(FILE * f, char * prg)
 /* ru */     "  russian      russkiy\n"
 /* sr */     "  serbian\n"
 /* sk */     "  slovak\n"
-/* sl */     "  slovenian\n"
+/* sl */     "  slovenian    slovensko\n"
 /* es */     "  spanish      espanol\n"
 /* sv */     "  swedish      svenska\n"
 /* ta */     "  tamil\n"
 /* tr */     "  turkish\n"
-/* zh */     "  walloon\n"
+/* wa */     "  walloon      walon\n"
 	  "\n",
 	  prg);
 }
@@ -4505,7 +4505,8 @@ void setup(int argc, char * argv[])
 	  putenv("LANG=ms_MY");
 	  putenv("LC_ALL=ms_MY");
 	}
-      else if (strcmp(langstr, "dutch") == 0)
+      else if (strcmp(langstr, "dutch") == 0 ||
+	       strcmp(langstr, "nederlands") == 0)
 	{
 	  putenv("LANG=nl_NL@euro");
 	  putenv("LC_ALL=nl_NL@euro");
@@ -4552,7 +4553,8 @@ void setup(int argc, char * argv[])
 	  putenv("LANG=sk_SK");
 	  putenv("LC_ALL=sk_SK");
 	}
-      else if (strcmp(langstr, "slovenian") == 0)
+      else if (strcmp(langstr, "slovenian") == 0 ||
+	       strcmp(langstr, "slovensko") == 0)
 	{
 	  putenv("LANG=sl_SI");
 	  putenv("LC_ALL=sl_SI");
@@ -4573,7 +4575,8 @@ void setup(int argc, char * argv[])
 	  putenv("LANG=tr_TR@euro");
 	  putenv("LC_ALL=tr_TR@euro");
 	}
-      else if (strcmp(langstr, "walloon") == 0)
+      else if (strcmp(langstr, "walloon") == 0 ||
+	       strcmp(langstr, "walon") == 0)
 	{
 	  putenv("LANG=wa_BE@euro");
 	  putenv("LC_ALL=wa_BE@euro");