diff --git a/ChangeLog b/ChangeLog
index 52945b0cfd..9e143582a8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2006-04-25  Ulrich Drepper  <drepper@redhat.com>
+
+	[BZ #2569]
+	* iconv/gconv_db.c (__gconv_release_step): Fix condition of assert
+	call.
+	* iconvdata/Makefile (tests): Add tst-iconv6.
+	* iconvdata/tst-iconv6.c: New file.
+
 2006-04-24  Ulrich Drepper  <drepper@redhat.com>
 
 	* posix/tst-rfc3484.c (do_test): Also initialize source_addr_flags
diff --git a/iconv/gconv_db.c b/iconv/gconv_db.c
index 3431ce0812..6540cc393c 100644
--- a/iconv/gconv_db.c
+++ b/iconv/gconv_db.c
@@ -1,5 +1,5 @@
 /* Provide access to the collection of available transformation modules.
-   Copyright (C) 1997-2003, 2004, 2005 Free Software Foundation, Inc.
+   Copyright (C) 1997-2003, 2004, 2005, 2006 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
    Contributed by Ulrich Drepper <drepper@cygnus.com>, 1997.
 
@@ -227,7 +227,7 @@ __gconv_release_step (struct __gconv_step *step)
       step->__shlib_handle = NULL;
 #endif
     }
-  else
+  else if (step->__shlib_handle == NULL)
     /* Builtin modules should not have end functions.  */
     assert (step->__end_fct == NULL);
 }
diff --git a/iconvdata/Makefile b/iconvdata/Makefile
index 1c80df16cf..1d3259179a 100644
--- a/iconvdata/Makefile
+++ b/iconvdata/Makefile
@@ -65,7 +65,8 @@ modules.so := $(addsuffix .so, $(modules))
 include ../Makeconfig
 
 ifeq (yes,$(build-shared))
-tests = bug-iconv1 bug-iconv2 tst-loading tst-e2big tst-iconv4 bug-iconv4
+tests = bug-iconv1 bug-iconv2 tst-loading tst-e2big tst-iconv4 bug-iconv4 \
+	tst-iconv6
 ifeq ($(have-thread-library),yes)
 tests += bug-iconv3
 endif
diff --git a/iconvdata/tst-iconv6.c b/iconvdata/tst-iconv6.c
new file mode 100644
index 0000000000..accb21b113
--- /dev/null
+++ b/iconvdata/tst-iconv6.c
@@ -0,0 +1,35 @@
+/* BZ #2569 */
+
+#include <iconv.h>
+#include <stdio.h>
+
+static int
+do_test (void)
+{
+  iconv_t cd0 = iconv_open ("ISO-8859-7", "UTF-16LE");
+  if (cd0 == (iconv_t) -1)
+    {
+      puts ("first iconv_open failed");
+      return 1;
+    }
+  iconv_t cd1 = iconv_open ("ISO-8859-7", "UTF-16LE");
+  if (cd1 == (iconv_t) -1)
+    {
+      puts ("second iconv_open failed");
+      return 1;
+    }
+  if (iconv_close (cd0) != 0)
+    {
+      puts ("first iconv_close failed");
+      return 1;
+    }
+  if (iconv_close (cd1) != 0)
+    {
+      puts ("second iconv_close failed");
+      return 1;
+    }
+  return 0;
+}
+
+#define TEST_FUNCTION do_test ()
+#include "../test-skeleton.c"