diff --git a/django/conf/global_settings.py b/django/conf/global_settings.py
index 4a137cf2b3..6a181ba40e 100644
--- a/django/conf/global_settings.py
+++ b/django/conf/global_settings.py
@@ -40,7 +40,7 @@ LANGUAGES = (
     ('fr', _('French')),
     ('gl', _('Galician')),
     ('it', _('Italian')),
-    ('no-nb', _('Norwegian')),
+    ('no', _('Norwegian')),
     ('pt-br', _('Brazilian')),
     ('ru', _('Russian')),
     ('sr', _('Serbian')),
diff --git a/django/conf/locale/no_NB/LC_MESSAGES/django.mo b/django/conf/locale/no/LC_MESSAGES/django.mo
similarity index 99%
rename from django/conf/locale/no_NB/LC_MESSAGES/django.mo
rename to django/conf/locale/no/LC_MESSAGES/django.mo
index 16046ade75..9491f7c326 100644
Binary files a/django/conf/locale/no_NB/LC_MESSAGES/django.mo and b/django/conf/locale/no/LC_MESSAGES/django.mo differ
diff --git a/django/conf/locale/no_NB/LC_MESSAGES/django.po b/django/conf/locale/no/LC_MESSAGES/django.po
similarity index 99%
rename from django/conf/locale/no_NB/LC_MESSAGES/django.po
rename to django/conf/locale/no/LC_MESSAGES/django.po
index 761a564872..335e66c1ba 100644
--- a/django/conf/locale/no_NB/LC_MESSAGES/django.po
+++ b/django/conf/locale/no/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-11-04 09:29-0600\n"
+"POT-Creation-Date: 2005-11-04 10:08-0600\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Espen Grndhaug <espen@grindhaug.org>\n"
 "Language-Team: Norwegian\n"