diff --git a/ChangeLog b/ChangeLog
index c85550ee6b4..a6fd1f01b65 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -70,8 +70,11 @@ For developers:
 - New: External modules can show export list with an "enabled" condition.
 - New: Support a backtopage parameter on contact creation page
 - New: Add id on div to show logo
+- New: Dictionnary setup works with very large external dictionnaries (Add 
+       page navigation).
 
 For translators:
+- New: Add fa_IR language.
 - Fix: Move code ar_AR to ar_SA, sv_SV to sv_SE and da_Da to da_DK.
 
 
diff --git a/htdocs/install/mysql/tables/llx_c_ziptown.key.sql b/htdocs/install/mysql/tables/llx_c_ziptown.key.sql
index eb9cdffcfa2..d6bd27758b4 100644
--- a/htdocs/install/mysql/tables/llx_c_ziptown.key.sql
+++ b/htdocs/install/mysql/tables/llx_c_ziptown.key.sql
@@ -1,5 +1,6 @@
 -- ========================================================================
--- Copyright (C) 2010 Regis Houssin <regis@dolibarr.fr>
+-- Copyright (C) 2010 Regis Houssin      <regis@dolibarr.fr>
+-- Copyright (C) 201 Laurent Destailleur <eldy@users.sourceforge.net>
 --
 -- This program is free software; you can redistribute it and/or modify
 -- it under the terms of the GNU General Public License as published by
@@ -20,5 +21,10 @@
 
 
 ALTER TABLE llx_c_ziptown ADD INDEX idx_c_ziptown_fk_county (fk_county);
+ALTER TABLE llx_c_ziptown ADD INDEX idx_c_ziptown_fk_pays   (fk_pays);
+ALTER TABLE llx_c_ziptown ADD INDEX idx_c_ziptown_zip       (zip);
 
-ALTER TABLE llx_c_ziptown ADD CONSTRAINT fk_c_ziptown_fk_county		FOREIGN KEY (fk_county)   REFERENCES llx_c_departements (rowid);
\ No newline at end of file
+ALTER TABLE llx_c_ziptown ADD CONSTRAINT fk_c_ziptown_fk_county	FOREIGN KEY (fk_county) REFERENCES llx_c_departements (rowid);
+ALTER TABLE llx_c_ziptown ADD CONSTRAINT fk_c_ziptown_fk_pays   FOREIGN KEY (fk_pays)   REFERENCES llx_c_pays(rowid);
+
+ALTER TABLE llx_c_ziptown ADD UNIQUE INDEX uk_ziptown_fk_pays (zip, town, fk_pays);