diff --git a/Makefile.am b/Makefile.am
index af2b43b..86032b1 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -71,7 +71,7 @@ STUBS_DIR = src/stubs
 
 SUBDIRS=$(FONTFILE_DIR) $(FREETYPE_DIR) $(BITMAP_DIR) \
 	$(BUILTINS_DIR) $(FC_DIR) $(UTIL_DIR) $(STUBS_DIR) $(FONTCACHE_DIR) \
-	$(TYPE1_DIR) $(SPEEDO_DIR) src/fontenc
+	$(TYPE1_DIR) $(SPEEDO_DIR)
 
 libXfont_la_LIBADD = $(FREETYPE_LIB) $(BITMAP_LIB) $(BUILTINS_LIB) \
 	$(FC_LIB) $(FONTFILE_LIB) $(UTIL_LIB) $(STUBS_LIB) \
@@ -93,7 +93,6 @@ libXfontinclude_HEADERS = \
 	include/X11/fonts/fntfilio.h \
 	include/X11/fonts/fntfilst.h \
 	include/X11/fonts/fontconf.h \
-	include/X11/fonts/fontenc.h  \
 	include/X11/fonts/fontencc.h \
 	include/X11/fonts/fontmisc.h \
 	include/X11/fonts/fontmod.h  \
diff --git a/configure.ac b/configure.ac
index 0a7441b..eec4c4a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -126,6 +126,7 @@ fi
 AM_CONDITIONAL(XFONT_FONTFILE, [test "x$XFONT_FONTFILE" = xyes])
 if test "x$XFONT_FONTFILE" = xyes; then
 	AC_DEFINE(XFONT_FONTFILE,,[Support fonts in files])
+	
 fi
 
 AC_CHECK_LIB(z, gzopen, [Z_LIBS=-lz
@@ -139,7 +140,7 @@ AC_SUBST(X_GZIP_FONT_COMPRESSION)
 AC_CHECK_LIB(m, hypot, [MATH_LIBS=-lm
 AC_SUBST(MATH_LIBS)], AC_MSG_ERROR([*** libm is required]))
 
-PKG_CHECK_MODULES(XFONT, xproto xtrans fontsproto)
+PKG_CHECK_MODULES(XFONT, xproto xtrans fontsproto fontenc)
 
 if test "x$GCC" = "xyes"; then
 	GCC_WARNINGS="-Wall -Wpointer-arith -Wstrict-prototypes \
@@ -162,5 +163,4 @@ AC_OUTPUT([Makefile
 	   src/fc/Makefile
 	   src/util/Makefile
 	   src/stubs/Makefile
-	   src/fontenc/Makefile
            xfont.pc])
diff --git a/src/Type1/t1funcs.c b/src/Type1/t1funcs.c
index ef99b93..64ff16e 100644
--- a/src/Type1/t1funcs.c
+++ b/src/Type1/t1funcs.c
@@ -133,7 +133,7 @@ from The Open Group.
 #include "fntfilst.h"
 #include "fontutil.h"
 #include <X11/fonts/FSproto.h>
-#include "fontenc.h"
+#include <X11/fonts/fontenc.h>
 #include "t1unicode.h"
  
 #ifdef BUILDCID
diff --git a/src/fontenc/Makefile.am b/src/fontenc/Makefile.am
deleted file mode 100644
index 93e9fe6..0000000
--- a/src/fontenc/Makefile.am
+++ /dev/null
@@ -1,14 +0,0 @@
-FONTDIR=${libdir}/X11/fonts
-FONTENCDEFS = -DFONT_ENCODINGS_DIRECTORY=\"$(FONTDIR)/encodings/encodings.dir\"
-
-INCLUDES =			\
-	-I${top_srcdir}/include/X11/fonts \
-	$(FONTENCDEFS)		
-
-lib_LTLIBRARIES = libfontenc.la
-
-libfontenc_la_SOURCES =					\
-	$(top_srcdir)/src/fontfile/encparse.c		\
-	$(top_srcdir)/src/fontfile/fontenc.c
-
-libfontenc_la_LIBADD = @X_LIBS@
diff --git a/src/fontfile/Makefile.am b/src/fontfile/Makefile.am
index 1ba16b9..6e70425 100644
--- a/src/fontfile/Makefile.am
+++ b/src/fontfile/Makefile.am
@@ -16,13 +16,10 @@ libfontfile_la_SOURCES = 	\
 	decompress.c		\
 	defaults.c		\
 	dirfile.c		\
-	encparse.c		\
 	ffcheck.c		\
 	fileio.c		\
 	filewr.c		\
 	fontdir.c		\
-	fontenc.c		\
-	fontencI.h		\
 	fontencc.c		\
 	fontfile.c		\
 	fontscale.c		\
diff --git a/src/fontfile/fontencc.c b/src/fontfile/fontencc.c
index cc77748..3e02582 100644
--- a/src/fontfile/fontencc.c
+++ b/src/fontfile/fontencc.c
@@ -28,7 +28,7 @@ THE SOFTWARE.
    *not* provide source compatibility, as many of the data structures
    now have different names. */
 
-#include "fontenc.h"
+#include <X11/fonts/fontenc.h>
 #include "fontencc.h"
 
 extern void ErrorF(const char *f, ...);