diff --git a/chinese/autoconvert/Makefile b/chinese/autoconvert/Makefile
index 144b0276aa2c..ecae4094cbc1 100644
--- a/chinese/autoconvert/Makefile
+++ b/chinese/autoconvert/Makefile
@@ -6,20 +6,23 @@
 #
 
 PORTNAME=	autoconvert
-PORTVERSION=	0.3.5
+PORTVERSION=	0.3.8
 CATEGORIES=	chinese
-MASTER_SITES=	http://www.linuxfocus.org/~yu.guanghui/ \
-		ftp://ftp.dlut.edu.cn/pub/PEOPLE/saka/
+MASTER_SITES=	ftp://banyan.dlut.edu.cn/pub/PEOPLE/saka/ \
+		http://www.csie.nctu.edu.tw/~yinjieh/
 
 MAINTAINER=	yinjieh@csie.nctu.edu.tw
 
-WRKSRC=		${WRKDIR}/autoconvert
+LIB_DEPENDS=	gnugetopt.1:${PORTSDIR}/devel/libgnugetopt
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/autob5 ${PREFIX}/bin
 	${INSTALL_PROGRAM} ${WRKSRC}/autogb ${PREFIX}/bin
+	${INSTALL_DATA} ${WRKSRC}/lib/libhz.a ${PREFIX}/lib
+	${INSTALL_DATA} ${WRKSRC}/lib/libhz.so.0.0 ${PREFIX}/lib/libhz.so.0
+	cd ${PREFIX}/lib; ${LN} -sf libhz.so.0 libhz.so
 	${MKDIR} ${PREFIX}/share/autoconvert
-.for i in ChangeLog GPL LICENSE Readme TODO Version hz.txt procmailrc.example shed.big5 shed.gb
+.for i in ChangeLog GPL LICENSE Readme TODO Thanks Version hz.txt procmailrc.example shed.big5 shed.gb shed.uni shed.utf7 shed.utf8
 	${INSTALL_DATA} ${WRKSRC}/$i ${PREFIX}/share/autoconvert
 .endfor
 
diff --git a/chinese/autoconvert/distinfo b/chinese/autoconvert/distinfo
index b8cf2bd72edd..794b449d2f65 100644
--- a/chinese/autoconvert/distinfo
+++ b/chinese/autoconvert/distinfo
@@ -1 +1 @@
-MD5 (autoconvert-0.3.5.tar.gz) = 6670956d42013fdbd58bc3e2fcfac06f
+MD5 (autoconvert-0.3.8.tar.gz) = 11b61f80813f37016caa2e9a1424913a
diff --git a/chinese/autoconvert/files/patch-aa b/chinese/autoconvert/files/patch-aa
index 04e28ead8118..e79aa195dff6 100644
--- a/chinese/autoconvert/files/patch-aa
+++ b/chinese/autoconvert/files/patch-aa
@@ -1,10 +1,18 @@
---- Makefile.orig	Wed Jan  5 13:50:05 2000
-+++ Makefile	Sun Apr  2 11:37:04 2000
-@@ -1,6 +1,6 @@
+--- Makefile.orig	Mon Jan  8 18:05:51 2001
++++ Makefile	Tue Jan  9 03:03:10 2001
+@@ -1,11 +1,12 @@
  
  CC=gcc
--CFLAG=-O2 -g -Iinclude
-+CFLAG+=-Iinclude
+-CFLAG=-O2 -g -Wall -Iinclude
+-LIBS= -Llib -lhz
++CFLAG+=-Iinclude -I/usr/local/include
++LIBS+=-Llib -lhz -L/usr/local/lib -lgnugetopt
  
+ .PHONY: all hzlib clean install-home install
  
- all: autob5 autogb hzlib 
+-all: autob5 autogb hzlib  xchat-plugins
++all: autob5 autogb hzlib
++#xchat-plugins
+ 
+ autob5: autogb
+ 	rm -f autob5;ln -s autogb autob5
diff --git a/chinese/autoconvert/files/patch-ab b/chinese/autoconvert/files/patch-ab
index 166dcee1b79b..4a2b37fe86a3 100644
--- a/chinese/autoconvert/files/patch-ab
+++ b/chinese/autoconvert/files/patch-ab
@@ -1,17 +1,20 @@
---- hzconvert/Makefile.orig	Wed Jan  5 13:12:31 2000
-+++ hzconvert/Makefile	Sun Apr  2 11:37:24 2000
-@@ -1,12 +1,11 @@
- CC=gcc -I../include
--CFLAGS=-O2
- OBJS=b2g.o b2u.o g2u.o hz2gb.o b2g_tables.o b2u_tables.o g2u_tables.o io.o unicode.o judge.o
-+all:libhzconvert
- %.o:%c
- 	$(CC) $(CFLAGS) -c $<
+--- hzconvert/Makefile.orig	Mon Jan  8 18:05:51 2001
++++ hzconvert/Makefile	Tue Jan  9 02:02:33 2001
+@@ -5,14 +5,14 @@
+ SHARED_LIB_MINOR=$(SHARED_LIB_MAJOR).0
+ OBJS=b2g.o b2u.o g2u.o hz2gb.o b2g_tables.o b2u_tables.o g2u_tables.o io.o unicode.o judge.o judge3.o gbpercent.o b5percent.o search.o 
  
--all:libhzconvert
- libhzconvert:$(OBJS)
++all: libhzconvert
++
+ %.o: %.c
+ 	$(CC) -fPIC $(CFLAGS) -c $<
+ 
+-all: libhzconvert
+-
+ libhzconvert: $(OBJS)
  	ar rs  ../lib/libhz.a $(OBJS)
--	gcc -shared  -o ../lib/libhz.so  $(OBJS) -ldl
-+	gcc -shared  -o ../lib/libhz.so  $(OBJS)
- clean:
- 	rm -f *.o *~ ../lib/libhz.a ../lib/libhz.so
+-	gcc -fPIC -shared -Wl,-soname,$(SHARED_LIB_MAJOR) -o ../lib/$(SHARED_LIB_MINOR)  $(OBJS) -ldl
++	gcc -fPIC -shared -Wl,-soname,$(SHARED_LIB_MAJOR) -o ../lib/$(SHARED_LIB_MINOR)  $(OBJS)
+ 	rm -f ../lib/$(SHARED_LIB_MAJOR)
+ 	rm -f ../lib/$(SHARED_LIB)
+ 	cd ../lib;ln -s $(SHARED_LIB_MINOR) $(SHARED_LIB_MAJOR)
diff --git a/chinese/autoconvert/pkg-plist b/chinese/autoconvert/pkg-plist
index e364abd544cb..20c0548d8f07 100644
--- a/chinese/autoconvert/pkg-plist
+++ b/chinese/autoconvert/pkg-plist
@@ -1,13 +1,20 @@
 bin/autob5
 bin/autogb
+lib/libhz.a
+lib/libhz.so
+lib/libhz.so.0
 share/autoconvert/ChangeLog
 share/autoconvert/GPL
 share/autoconvert/LICENSE
 share/autoconvert/Readme
 share/autoconvert/TODO
+share/autoconvert/Thanks
 share/autoconvert/Version
 share/autoconvert/hz.txt
+share/autoconvert/procmailrc.example
 share/autoconvert/shed.big5
 share/autoconvert/shed.gb
-share/autoconvert/procmailrc.example
+share/autoconvert/shed.uni
+share/autoconvert/shed.utf7
+share/autoconvert/shed.utf8
 @dirrm share/autoconvert