diff --git a/install/db/127-database.php b/install/db/127-database.php
new file mode 100644
index 000000000..0d0988f8e
--- /dev/null
+++ b/install/db/127-database.php
@@ -0,0 +1,48 @@
+<?php
+// +-----------------------------------------------------------------------+
+// | Piwigo - a PHP based photo gallery                                    |
+// +-----------------------------------------------------------------------+
+// | Copyright(C) 2008-2012 Piwigo Team                  http://piwigo.org |
+// | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
+// | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
+// +-----------------------------------------------------------------------+
+// | 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  |
+// | the Free Software Foundation                                          |
+// |                                                                       |
+// | This program is distributed in the hope that it will be useful, but   |
+// | WITHOUT ANY WARRANTY; without even the implied warranty of            |
+// | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU      |
+// | General Public License for more details.                              |
+// |                                                                       |
+// | You should have received a copy of the GNU General Public License     |
+// | along with this program; if not, write to the Free Software           |
+// | Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, |
+// | USA.                                                                  |
+// +-----------------------------------------------------------------------+
+
+if (!defined('PHPWG_ROOT_PATH'))
+{
+  die('Hacking attempt!');
+}
+
+$upgrade_description = 'rename language no_NO into nb_NO';
+
+include_once(PHPWG_ROOT_PATH.'include/constants.php');
+
+$query = '
+UPDATE '.USER_INFOS_TABLE.'
+  SET language = \'nb_NO\'
+  WHERE language = \'no_NO\'
+;';
+pwg_query($query);
+
+$query = '
+UPDATE '.LANGUAGES_TABLE.'
+  SET id = \'nb_NO\'
+  WHERE id = \'no_NO\'
+;';
+pwg_query($query);
+
+echo "\n".$upgrade_description."\n";
+?>
\ No newline at end of file
diff --git a/install/upgrade_2.3.0.php b/install/upgrade_2.3.0.php
index b33d0fb6a..c1aa07df7 100644
--- a/install/upgrade_2.3.0.php
+++ b/install/upgrade_2.3.0.php
@@ -83,7 +83,7 @@ if (!empty($inserts))
 ob_start();
 echo '<pre>';
 
-for ($upgrade_id = 112; $upgrade_id <= 126; $upgrade_id++)
+for ($upgrade_id = 112; $upgrade_id <= 127; $upgrade_id++)
 {
   if (!file_exists(UPGRADES_PATH.'/'.$upgrade_id.'-database.php'))
   {
diff --git a/language/no_NO/about.html b/language/nb_NO/about.html
similarity index 100%
rename from language/no_NO/about.html
rename to language/nb_NO/about.html
diff --git a/language/no_NO/admin.lang.php b/language/nb_NO/admin.lang.php
similarity index 100%
rename from language/no_NO/admin.lang.php
rename to language/nb_NO/admin.lang.php
diff --git a/language/no_NO/common.lang.php b/language/nb_NO/common.lang.php
similarity index 100%
rename from language/no_NO/common.lang.php
rename to language/nb_NO/common.lang.php
diff --git a/language/no_NO/help/cat_modify.html b/language/nb_NO/help/cat_modify.html
similarity index 100%
rename from language/no_NO/help/cat_modify.html
rename to language/nb_NO/help/cat_modify.html
diff --git a/language/no_NO/help/cat_move.html b/language/nb_NO/help/cat_move.html
similarity index 100%
rename from language/no_NO/help/cat_move.html
rename to language/nb_NO/help/cat_move.html
diff --git a/language/no_NO/help/cat_options.html b/language/nb_NO/help/cat_options.html
similarity index 100%
rename from language/no_NO/help/cat_options.html
rename to language/nb_NO/help/cat_options.html
diff --git a/language/no_NO/help/cat_perm.html b/language/nb_NO/help/cat_perm.html
similarity index 100%
rename from language/no_NO/help/cat_perm.html
rename to language/nb_NO/help/cat_perm.html
diff --git a/language/no_NO/help/configuration.html b/language/nb_NO/help/configuration.html
similarity index 100%
rename from language/no_NO/help/configuration.html
rename to language/nb_NO/help/configuration.html
diff --git a/language/no_NO/help/extend_for_templates.html b/language/nb_NO/help/extend_for_templates.html
similarity index 100%
rename from language/no_NO/help/extend_for_templates.html
rename to language/nb_NO/help/extend_for_templates.html
diff --git a/language/no_NO/help/group_list.html b/language/nb_NO/help/group_list.html
similarity index 100%
rename from language/no_NO/help/group_list.html
rename to language/nb_NO/help/group_list.html
diff --git a/language/no_NO/help/help_add_photos.html b/language/nb_NO/help/help_add_photos.html
similarity index 100%
rename from language/no_NO/help/help_add_photos.html
rename to language/nb_NO/help/help_add_photos.html
diff --git a/language/no_NO/help/help_groups.html b/language/nb_NO/help/help_groups.html
similarity index 100%
rename from language/no_NO/help/help_groups.html
rename to language/nb_NO/help/help_groups.html
diff --git a/language/no_NO/help/help_misc.html b/language/nb_NO/help/help_misc.html
similarity index 100%
rename from language/no_NO/help/help_misc.html
rename to language/nb_NO/help/help_misc.html
diff --git a/language/no_NO/help/help_permissions.html b/language/nb_NO/help/help_permissions.html
similarity index 100%
rename from language/no_NO/help/help_permissions.html
rename to language/nb_NO/help/help_permissions.html
diff --git a/language/no_NO/help/help_virtual_links.html b/language/nb_NO/help/help_virtual_links.html
similarity index 100%
rename from language/no_NO/help/help_virtual_links.html
rename to language/nb_NO/help/help_virtual_links.html
diff --git a/language/no_NO/help/history.html b/language/nb_NO/help/history.html
similarity index 100%
rename from language/no_NO/help/history.html
rename to language/nb_NO/help/history.html
diff --git a/language/no_NO/help/maintenance.html b/language/nb_NO/help/maintenance.html
similarity index 100%
rename from language/no_NO/help/maintenance.html
rename to language/nb_NO/help/maintenance.html
diff --git a/language/no_NO/help/notification_by_mail.html b/language/nb_NO/help/notification_by_mail.html
similarity index 100%
rename from language/no_NO/help/notification_by_mail.html
rename to language/nb_NO/help/notification_by_mail.html
diff --git a/language/no_NO/help/permalinks.html b/language/nb_NO/help/permalinks.html
similarity index 100%
rename from language/no_NO/help/permalinks.html
rename to language/nb_NO/help/permalinks.html
diff --git a/language/no_NO/help/photos_add_ftp.html b/language/nb_NO/help/photos_add_ftp.html
similarity index 100%
rename from language/no_NO/help/photos_add_ftp.html
rename to language/nb_NO/help/photos_add_ftp.html
diff --git a/language/no_NO/help/search.html b/language/nb_NO/help/search.html
similarity index 100%
rename from language/no_NO/help/search.html
rename to language/nb_NO/help/search.html
diff --git a/language/no_NO/help/synchronize.html b/language/nb_NO/help/synchronize.html
similarity index 100%
rename from language/no_NO/help/synchronize.html
rename to language/nb_NO/help/synchronize.html
diff --git a/language/no_NO/help/user_list.html b/language/nb_NO/help/user_list.html
similarity index 100%
rename from language/no_NO/help/user_list.html
rename to language/nb_NO/help/user_list.html
diff --git a/language/no_NO/index.php b/language/nb_NO/index.php
similarity index 100%
rename from language/no_NO/index.php
rename to language/nb_NO/index.php
diff --git a/language/no_NO/install.lang.php b/language/nb_NO/install.lang.php
similarity index 100%
rename from language/no_NO/install.lang.php
rename to language/nb_NO/install.lang.php
diff --git a/language/nb_NO/iso.txt b/language/nb_NO/iso.txt
new file mode 100644
index 000000000..42ebfd000
--- /dev/null
+++ b/language/nb_NO/iso.txt
@@ -0,0 +1 @@
+Norwegian [NB]
diff --git a/language/no_NO/no_NO.jpg b/language/nb_NO/nb_NO.jpg
similarity index 100%
rename from language/no_NO/no_NO.jpg
rename to language/nb_NO/nb_NO.jpg
diff --git a/language/no_NO/upgrade.lang.php b/language/nb_NO/upgrade.lang.php
similarity index 100%
rename from language/no_NO/upgrade.lang.php
rename to language/nb_NO/upgrade.lang.php
diff --git a/language/no_NO/iso.txt b/language/no_NO/iso.txt
deleted file mode 100644
index bfb46e31e..000000000
--- a/language/no_NO/iso.txt
+++ /dev/null
@@ -1 +0,0 @@
-Norwegian [NO]
\ No newline at end of file