diff --git a/ChangeLog b/ChangeLog
index df2ffa0f6..0a4d49ce9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2000-08-24  Pavel Roskin  <proski@gnu.org>
 
+	* lib/Makefile.in: converted to ...
+	* lib/Makefile.am: ... this
+
 	* lib/tkmc.wmconfig: removed
 	* lib/Makefile.in, doc/FILES: removed lib/tkmc.wmconfig
 
diff --git a/lib/Makefile.am b/lib/Makefile.am
new file mode 100644
index 000000000..0dd1041b9
--- /dev/null
+++ b/lib/Makefile.am
@@ -0,0 +1,32 @@
+mclibdir   = $(libdir)/mc
+desktopdir = $(mclibdir)/desktop-scripts
+suppbindir = $(mclibdir)/bin
+tidir      = $(mclibdir)/term
+confdir    = $(sysconfdir)
+
+LIBFILES_IN = mc.ext.in mc-gnome.ext.in
+LIBFILES_OUT = mc.ext mc-gnome.ext
+LIBFILES_CONST = mc.hint mc.hint.es mc.hint.cs mc.hint.ru \
+	mc.lib mc.menu cedit.menu edit.indent.rc
+SUPPBIN_IN = mc.csh.in mc.sh.in
+SUPPBIN_OUT =  mc.csh mc.sh
+DESKTOP_FILES = startup.links README.desktop
+TIFILES = README.xterm linux.ti xterm.ad xterm.ti ansi.ti vt100.ti xterm.tcap
+NOINST_FILES = tdiff		\
+	tdiff		 	\
+	xnc.hlp			\
+	ncurses.h 		\
+	mcserv.init 		\
+	mcserv.pamd 		\
+	mc.ext.in.qnx.diff 	\
+	mc.global
+
+conf_DATA = mc.global
+
+# Files processed by configure don't need to be here
+EXTRA_DIST = $(LIBFILES_CONST) $(TIFILES) $(DESKTOP_FILES) $(conf_DATA)
+
+mclib_DATA = $(LIBFILES_CONST) $(LIBFILES_OUT)
+suppbin_SCRIPTS = $(SUPPBIN_OUT)
+ti_DATA = $(TIFILES)
+desktop_DATA = $(DESKTOP_FILES)
diff --git a/lib/Makefile.in b/lib/Makefile.in
deleted file mode 100644
index b40a49e9e..000000000
--- a/lib/Makefile.in
+++ /dev/null
@@ -1,89 +0,0 @@
-srcdir = @srcdir@
-VPATH = @srcdir@
-
-rootdir = $(srcdir)/..
-@MCFG@@MCF@
-
-INSTALL = @INSTALL@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@
-INSTALL_DATA = @INSTALL_DATA@
-
-#
-# Distribution variables
-#
-
-LIBFILES_IN = mc.ext.in mc-gnome.ext.in
-LIBFILES_OUT = mc.ext mc-gnome.ext
-LIBFILES_CONST = mc.hint mc.hint.es mc.hint.cs mc.hint.ru mc.lib mc.menu cedit.menu edit.indent.rc
-SUPPBIN_IN = mc.csh.in mc.sh.in
-SUPPBIN_OUT =  mc.csh mc.sh
-DESKTOP_FILES = startup.links README.desktop
-TIFILES = README.xterm linux.ti xterm.ad xterm.ti ansi.ti vt100.ti xterm.tcap
-
-DISTLIB = \
-	$(LIBFILES_IN) 		\
-	$(LIBFILES_CONST) 	\
-	$(SUPPBIN_IN)           \
-	$(TIFILES) 		\
-	$(DESKTOP_FILES)	\
-	Makefile.in tdiff 	\
-	xnc.hlp ncurses.h 	\
-	mcserv.init 		\
-	mcserv.pamd 		\
-	mc.ext.in.qnx.diff 	\
-	mc.global
-
-all: Makefile
-
-Makefile: ../config.status Makefile.in
-	(cd ..; CONFIG_FILES=lib/Makefile CONFIG_HEADERS= ./config.status)
-
-check:
-	@echo no tests are supplied.
-
-TAGS:
-
-cross:
-
-clean:
-
-realclean:
-
-distclean:
-	$(RMF) $(srcdir)/*~ $(srcdir)/Makefile
-	for I in $(LIBFILES_OUT); do $(RMF) $(srcdir)/$$I; done
-	for I in $(SUPPBIN_OUT); do $(RMF) $(srcdir)/$$I; done
-
-install:
-	for I in $(LIBFILES_CONST); \
-	do $(INSTALL_DATA) $(srcdir)/$$I $(DESTDIR)$(mclibdir)/$$I; done
-	for I in $(LIBFILES_OUT); \
-	do $(INSTALL_DATA) $(builddir)/lib/$$I $(DESTDIR)$(mclibdir)/$$I; done
-	for I in $(SUPPBIN_OUT); \
-	do $(INSTALL_PROGRAM) -m 755 $(builddir)/lib/$$I $(DESTDIR)$(suppbindir)/$$I; done
-	for I in $(TIFILES); \
-	do $(INSTALL_DATA) $(srcdir)/$$I $(DESTDIR)$(tidir)/$$I; done
-	$(MKINSTALLDIRS) $(DESTDIR)$(confdir)
-	$(INSTALL_DATA) $(srcdir)/mc.global $(DESTDIR)$(confdir)
-	$(MKINSTALLDIRS) $(DESTDIR)$(desktopdir)
-	for I in $(DESKTOP_FILES); \
-	do $(INSTALL_DATA) $(srcdir)/$$I $(DESTDIR)$(desktopdir)/$$I; done
-
-uninstall:
-	for I in $(LIBFILES_OUT) $(LIBFILES_CONST); \
-	do $(RMF) $(DESTDIR)$(mclibdir)/$$I; done
-	for I in $(SUPPBIN_OUT); \
-	do $(RMF) $(DESTDIR)$(suppbindir)/$$I; done
-	for I in $(DESKTOP_FILES); \
-	do $(RMF) $(DESTDIR)$(desktopdir)/$$I; done
-	for I in $(TIFILES); \
-	do $(RMF) $(DESTDIR)$(tidir)/$$I; done
-	$(RMF) $(DESTDIR)$(confdir)/mc.global
-	-rmdir $(DESTDIR)$(desktopdir)
-	-rmdir $(DESTDIR)$(tidir)
-	-rmdir $(DESTDIR)$(mclibdir)
-
-distcopy:
-	for I in $(DISTLIB); do $(CP) $(top_srcdir)/lib/$$I $(top_srcdir)/mc-$(VERSION)/lib; done
-
-depend dep: