Update for Haiku. From gnulib.
diff --git a/libcharset/lib/ChangeLog b/libcharset/lib/ChangeLog
index 535e4e4..4c7e391 100644
--- a/libcharset/lib/ChangeLog
+++ b/libcharset/lib/ChangeLog
@@ -1,3 +1,7 @@
+2008-11-10  Ingo Weinhold  <ingo_weinhold@gmx.de>
+
+	* config.charset: Treat Haiku like BeOS.
+
 2009-01-16  Bruno Haible  <bruno@clisp.org>
 
 	* Makefile.in (install-strip): New target.
diff --git a/libcharset/lib/config.charset b/libcharset/lib/config.charset
index 85dd85f..8b82059 100755
--- a/libcharset/lib/config.charset
+++ b/libcharset/lib/config.charset
@@ -1,7 +1,7 @@
 #! /bin/sh
 # Output a system dependent table of character encoding aliases.
 #
-#   Copyright (C) 2000-2004, 2006-2007 Free Software Foundation, Inc.
+#   Copyright (C) 2000-2004, 2006-2008 Free Software Foundation, Inc.
 #
 #   This program is free software; you can redistribute it and/or modify it
 #   under the terms of the GNU Library General Public License as published
@@ -479,8 +479,8 @@
 	# space nevertheless.
 	echo "* UTF-8"
 	;;
-    beos*)
-	# BeOS has a single locale, and it has UTF-8 encoding.
+    beos* | haiku*)
+	# BeOS and Haiku have a single locale, and it has UTF-8 encoding.
 	echo "* UTF-8"
 	;;
     msdosdjgpp*)