diff --git a/doc/CHANGELOG b/doc/CHANGELOG
index 0d807c02be..788d7b9f01 100755
--- a/doc/CHANGELOG
+++ b/doc/CHANGELOG
@@ -26,6 +26,7 @@
 	      - Group public items should now be working.
 		 - Fixed a wrong data type error when calling sort() on 1 folder.
 		 - Added week number in month view of calendar. (Patch by grasl)
+	      - Moved charset setting from globalconfig.inc.php / DB to lang files.
 	      - A bunch of other minor bug fixes.
 
 [09072000] - Added print icon that allows you to print out a page without having
diff --git a/doc/lang.sql b/doc/lang.sql
index 53d5aebe9c..eb67aa54c6 100644
--- a/doc/lang.sql
+++ b/doc/lang.sql
@@ -1,3 +1,4 @@
+INSERT INTO lang (message_id, app_name, lang, content) VALUES( 'charset','common','en','iso-8859-1');
 INSERT INTO lang (message_id, app_name, lang, content) VALUES( 'low','common','en','Low');
 INSERT INTO lang (message_id, app_name, lang, content) VALUES( 'forum','common','en','Forum');
 INSERT INTO lang (message_id, app_name, lang, content) VALUES( 'normal','common','en','Normal');
diff --git a/doc/update_09072000_to_09262000.mysql b/doc/update_09072000_to_09262000.mysql
index 040ad62360..21e39be0e9 100644
--- a/doc/update_09072000_to_09262000.mysql
+++ b/doc/update_09072000_to_09262000.mysql
@@ -73,3 +73,5 @@ insert into config (config_name, config_value) values ('httpproxy_port', '');
 insert into config (config_name, config_value) values ('showpoweredbyon', 'bottom');
 insert into config (config_name, config_value) values ('checkfornewversion', 'False');
 
+insert into lang (message_id, app_name, lang, content) VALUES( 'charset','common','en','iso-8859-1');
+
diff --git a/doc/update_09072000_to_09262000.pgsql b/doc/update_09072000_to_09262000.pgsql
index 03ee4e858e..7aab4618b6 100644
--- a/doc/update_09072000_to_09262000.pgsql
+++ b/doc/update_09072000_to_09262000.pgsql
@@ -73,3 +73,6 @@ insert into config (config_name, config_value) values ('httpproxy_port', '');
 insert into config (config_name, config_value) values ('showpoweredbyon', 'bottom');
 insert into config (config_name, config_value) values ('checkfornewversion', 'False');
 
+insert into lang (message_id, app_name, lang, content) VALUES( 'charset','common','en','iso-8859-1');
+insert into lang (message_id, app_name, lang, content) VALUES( 'charset','common','de','iso-8859-1');
+