diff --git a/x11-servers/XttXF86srv-common/Makefile b/x11-servers/XttXF86srv-common/Makefile
index b91b5eae31bf..cec1cdf8432b 100644
--- a/x11-servers/XttXF86srv-common/Makefile
+++ b/x11-servers/XttXF86srv-common/Makefile
@@ -3,7 +3,7 @@
 # Date created:		15 April 1998
 # Whom:			Taguchi Takeshi <taguchi@tohoku.iij.ad.jp>
 #
-# $Id: Makefile,v 1.5 1998/10/10 04:22:09 steve Exp $
+# $Id: Makefile,v 1.6 1998/10/15 01:18:23 jseger Exp $
 #
 
 DISTNAME=	xc
@@ -24,8 +24,6 @@ PATCHFILES=	3.3.2-patch1 3.3.2-patch2 3.3.2-patch3 \
 
 MAINTAINER=	taguchi@tohoku.iij.ad.jp
 
-BROKEN_ELF=	yes
-
 LIB_DEPENDS=	ttf.2:${PORTSDIR}/print/freetype
 
 .if !defined(XDM_DES) && defined(USA_RESIDENT)
@@ -104,7 +102,7 @@ pre-fetch:
 pre-patch:
 	@( ${PATCH} ${PATCH_DIST_ARGS} < ${XTTDIR}/xtt-1.0.diff; \
 	${GZCAT} ${DISTDIR}/${DIST_SUBDIR}/xttdoc10-to-pl00.diff.gz | \
-	${PATCH} -d ${XTTDIR} )
+	${PATCH} -s -d ${XTTDIR} )
 
 pre-configure:
 	@( \
@@ -141,10 +139,14 @@ do-install:
 	@( \
 	cd ${WRKSRC}/lib/font; \
 	${SETENV} ${MAKE_ENV} ${MAKE} install; \
+	if [ "${PORTOBJFORMAT}" = "aout" ]; then \
+		${LN} -sf libfont.so.1.0 ${PREFIX}/lib/libfont.so; \
+	fi; \
 	${SETENV} OBJFORMAT=${PORTOBJFORMAT} ${LDCONFIG} -m ${PREFIX}/lib; \
 	${INSTALL_SCRIPT} ${FILESDIR}/mkfontdir.pl ${PREFIX}/bin; \
 	${MKDIR} ${DOCDIR}; \
-	${INSTALL_DATA} ${XTTDIR}/xtt10-* ${DOCDIR})
+	${INSTALL_DATA} ${XTTDIR}/xtt10-*.eng ${DOCDIR}; \
+	${INSTALL_DATA} ${XTTDIR}/xtt10-*.jis ${DOCDIR} )
 .elif defined(SERVER) && ${SERVER} == xfs
 do-install:
 	@${SETENV} OBJFORMAT=${PORTOBJFORMAT} ${INSTALL_PROGRAM} ${WRKSRC}/programs/xfs/xfs ${PREFIX}/bin/xfs.xtt
diff --git a/x11-servers/XttXF86srv-common/files/Imakefile b/x11-servers/XttXF86srv-common/files/Imakefile
index 90fca3352950..886459347520 100644
--- a/x11-servers/XttXF86srv-common/files/Imakefile
+++ b/x11-servers/XttXF86srv-common/files/Imakefile
@@ -99,7 +99,7 @@ ELFCheck:: initialize
 .if defined(PORTOBJFORMAT) && ${PORTOBJFORMAT} == elf
 	@( \
 	${ECHO} "#define UseElfFormat YES" >> ${CONFFILE}; \
-	${ECHO} "#define FreeTypeCConvModule NO" >> ${CONFFILE}; \
+	${ECHO} "#define BuildDynamicLoading YES" >> ${CONFFILE}; \
 	${ECHO_MSG} "   Using ELF format." )
 .else
 	@${DO_NADA}
diff --git a/x11-servers/XttXF86srv-common/pkg-plist b/x11-servers/XttXF86srv-common/pkg-plist
index 7d27af2a3b38..bab69d04b053 100644
--- a/x11-servers/XttXF86srv-common/pkg-plist
+++ b/x11-servers/XttXF86srv-common/pkg-plist
@@ -20,6 +20,8 @@ lib/modules/codeconv/BIG5.so
 lib/modules/codeconv/GB2312.so
 lib/modules/codeconv/ISO8859_1.so
 lib/modules/codeconv/ISO8859_10.so
+lib/modules/codeconv/ISO8859_11.so
+lib/modules/codeconv/ISO8859_14.so
 lib/modules/codeconv/ISO8859_15.so
 lib/modules/codeconv/ISO8859_2.so
 lib/modules/codeconv/ISO8859_3.so
@@ -35,6 +37,7 @@ lib/modules/codeconv/JISX0212.so
 lib/modules/codeconv/KOI8.so
 lib/modules/codeconv/KSC5601.so
 lib/modules/codeconv/KSCJOHAB.so
+lib/modules/codeconv/VISCII.so
 lib/libfont.a
 lib/libfont.so
 lib/libfont.so.1.0