diff --git a/ChangeLog b/ChangeLog
index dd9049e1e0..63a64b9386 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2006-01-17  Robert Love  <rml@novell.com>
+
+	* configure.in: Remove 'no' language.  Replaced by 'nb', which is
+	  identical for NM.  For a full discussion, see the thread at
+	  http://mail.gnome.org/archives/gnome-i18n/2004-August/msg00006.html.
+	* po/no.po: Remove.
+
 2006-01-17  Dan Williams  <dcbw@redhat.com>
 
 	* src/nm-device.c
diff --git a/configure.in b/configure.in
index 4fad95b088..2629b02e98 100644
--- a/configure.in
+++ b/configure.in
@@ -40,7 +40,7 @@ dnl
 GETTEXT_PACKAGE=NetworkManager
 AC_SUBST(GETTEXT_PACKAGE)
 AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE,"$GETTEXT_PACKAGE", [Gettext package])
-ALL_LINGUAS="bg bs ca cs da de el en_CA es fi fr gu hr hu it ja lt nb ne nl no pa pt_BR rw sk sq sr sr@Latn sv uk wa zh_CN zh_TW"
+ALL_LINGUAS="bg bs ca cs da de el en_CA es fi fr gu hr hu it ja lt nb ne nl pa pt_BR rw sk sq sr sr@Latn sv uk wa zh_CN zh_TW"
 AC_PROG_INTLTOOL([0.27.2])
 AM_GLIB_GNU_GETTEXT