*** ./lib/multibyte.c.ORIG	Mon Mar 28 14:10:52 2011
--- ./lib/multibyte.c	Mon Mar 28 14:11:32 2011
***************
*** 846,852 ****
  {
    unsigned char *buffer = analyser->buffer;
    size_t size = analyser->size;
!   static int hz = ENCA_CS_UNKNOWN; /* HZ charset */
    size_t hzcount = 0; /* number of qp encoded characters */
    unsigned char *p = buffer;
    const size_t *const counts = analyser->counts;
--- 846,852 ----
  {
    unsigned char *buffer = analyser->buffer;
    size_t size = analyser->size;
!   static int AIXhz = ENCA_CS_UNKNOWN; /* HZ charset */
    size_t hzcount = 0; /* number of qp encoded characters */
    unsigned char *p = buffer;
    const size_t *const counts = analyser->counts;
***************
*** 856,867 ****
  
    /* Initialize when we are called the first time. */
    if (hz == ENCA_CS_UNKNOWN) {
!     hz = enca_name_to_charset("hz");
!     assert(hz != ENCA_CS_UNKNOWN);
    }
  
    for (i = 0; i < analyser->ncharsets; i++)
!    if (analyser->charsets[i] ==  hz)
       goto goahead;
    return 0;
  
--- 856,867 ----
  
    /* Initialize when we are called the first time. */
    if (hz == ENCA_CS_UNKNOWN) {
!     AIXhz = enca_name_to_charset("hz");
!     assert(AIXhz != ENCA_CS_UNKNOWN);
    }
  
    for (i = 0; i < analyser->ncharsets; i++)
!    if (analyser->charsets[i] ==  AIXhz)
       goto goahead;
    return 0;
  
***************
*** 950,956 ****
    if (escaped && analyser->options.termination_strictness > 0)
      return 0;
  
!   analyser->result.charset = hz;
    analyser->result.surface |= enca_eol_surface(buffer, size, counts);
  
    return 1;
--- 950,956 ----
    if (escaped && analyser->options.termination_strictness > 0)
      return 0;
  
!   analyser->result.charset = AIXhz;
    analyser->result.surface |= enca_eol_surface(buffer, size, counts);
  
    return 1;
*** ./Makefile.in.ORIG	Mon Mar 28 14:36:13 2011
--- ./Makefile.in	Mon Mar 28 14:36:24 2011
***************
*** 906,912 ****
  	cd $(DESTDIR)$(man1dir); \
  	inst1=`echo enca | sed '$(transform)'`.1; \
  	inst2=`echo enconv | sed '$(transform)'`.1; \
! 	$(LN_S) $$inst1 $$inst2
  
  uninstall-hook:
  	inst=`echo enconv | sed '$(transform)'`.1; \
--- 906,912 ----
  	cd $(DESTDIR)$(man1dir); \
  	inst1=`echo enca | sed '$(transform)'`.1; \
  	inst2=`echo enconv | sed '$(transform)'`.1; \
! 	$(LN_S) -f $$inst1 $$inst2
  
  uninstall-hook:
  	inst=`echo enconv | sed '$(transform)'`.1; \