diff --git a/ChangeLog b/ChangeLog
index 4798c3a4bf..bdc4b4d409 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2009-09-20  Andreas Schwab  <schwab@linux-m68k.org>
+
+	* iconvdata/iso646.c (gconv_init): Correctly initialize the
+	character size elements in step data.
+
 2009-09-20  Ulrich Drepper  <drepper@redhat.com>
 
 	* po/hu.po: Update from translation team.
diff --git a/iconvdata/iso646.c b/iconvdata/iso646.c
index f388ae7de2..0989532c72 100644
--- a/iconvdata/iso646.c
+++ b/iconvdata/iso646.c
@@ -156,7 +156,7 @@ gconv_init (struct __gconv_step *step)
 	  new_data->var = var;
 	  step->__data = new_data;
 
-	  if (var == from_iso646)
+	  if (dir == from_iso646)
 	    {
 	      step->__min_needed_from = MIN_NEEDED_FROM;
 	      step->__max_needed_from = MIN_NEEDED_FROM;