diff --git a/ChangeLog b/ChangeLog
index d9ec1c8d70..3357a19f51 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2001-02-25  Ulrich Drepper  <drepper@redhat.com>
+
+	* intl/locale.alias: Don't use nb_NO but define aliases for it.
+
 2001-02-23  Ulrich Drepper  <drepper@redhat.com>
 
 	* sysdeps/i386/strtok.S: Continue to return NULL after the first
diff --git a/intl/locale.alias b/intl/locale.alias
index 55afd94d5b..be2da97c4c 100644
--- a/intl/locale.alias
+++ b/intl/locale.alias
@@ -1,5 +1,5 @@
 # Locale name alias data base.
-# Copyright (C) 1996, 1997, 1998, 1999, 2000  Free Software Foundation, Inc.
+# Copyright (C) 1996,1997,1998,1999,2000,2001 Free Software Foundation, Inc.
 #
 # 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
@@ -26,8 +26,8 @@
 # it with the rest of us.  Send it using the `glibcbug' script to
 # bugs@gnu.org.
 
-bokmal		nb_NO.ISO-8859-1
-bokmål		nb_NO.ISO-8859-1
+bokmal		no_NO.ISO-8859-1
+bokmål		no_NO.ISO-8859-1
 catalan		ca_ES.ISO-8859-1
 croatian	hr_HR.ISO-8859-2
 czech		cs_CZ.ISO-8859-2
@@ -59,6 +59,7 @@ korean.euc 	ko_KR.eucKR
 ko_KR		ko_KR.eucKR
 lithuanian      lt_LT.ISO-8859-13
 nb_NO		no_NO.ISO-8859-1
+nb_NO.ISO-8859-1 no_NO.ISO-8859-1
 norwegian       no_NO.ISO-8859-1
 nynorsk		nn_NO.ISO-8859-1
 polish          pl_PL.ISO-8859-2