diff --git a/phpBB/upgrade.php b/phpBB/upgrade.php
index 7474a42959..347d184f70 100644
--- a/phpBB/upgrade.php
+++ b/phpBB/upgrade.php
@@ -571,6 +571,11 @@ if ( !empty($next) )
 				}
 			}
 			
+			$sql = "UPDATE " . CONFIG_TABLE . " 
+				SET config_value = 'dutch' 
+				WHERE config_name = 'default_lang' && config_value = 'nederlands'";
+			query($sql, "Couldn't rename 'nederlands' to 'dutch' in config table");
+			
 			print "<span class=\"ok\"><b>OK</b></span><br />\n";
 			end_step('convert_ips');
 
@@ -898,6 +903,14 @@ if ( !empty($next) )
 						$first_admin = $row['user_id'];
 					}
 
+					//
+					// Dutch language files have been renamed from 'nederlands' to 'dutch'
+					//
+					if( $row['user_lang'] == 'nederlands' )
+					{
+						$row['user_lang'] = 'dutch';
+					}
+
 					$sql = "UPDATE " . USERS_TABLE . " 
 						SET 
 							user_sig = '" . $row['user_sig'] . "',
@@ -1859,4 +1872,4 @@ print "<br />If the upgrade completed without error you may click <a href=\"inde
 
 common_footer();
 
-?>
\ No newline at end of file
+?>