diff --git a/ChangeLog b/ChangeLog
index 05094a72ac..09574cde16 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -4,6 +4,8 @@
 
 2002-04-08  Lars Gullik Bjønnes  <larsbj@birdstep.com>
 
+	* UPGRADING: remove stuff that is not relevant now.
+
 	* Makefile.am (bindist): new bindist target
 
 2002-04-06  Lars Gullik Bjønnes  <larsbj@birdstep.com>
diff --git a/Makefile.am b/Makefile.am
index d921ef3af1..7756d429e2 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -15,6 +15,9 @@ EXTRA_DIST = ANNOUNCE INSTALL.OS2 INSTALL.autoconf README.OS2 \
 	UPGRADING lyx.man acconfig.h autogen.sh \
 	development images sourcedoc
 
+# Hack so that the targets that use tar will also work with automake 1.4
+AMTAR ?= $(TAR)
+
 man_MANS = lyx.1
 
 ## Needed by bindist
diff --git a/UPGRADING b/UPGRADING
index 579ecc80e7..b08f47a00e 100644
--- a/UPGRADING
+++ b/UPGRADING
@@ -1,34 +1,19 @@
 How do I upgrade my existing LyX system to version 1.1.6?
 ---------------------------------------------------------
 
-If you upgrade from version 0.12.0 or 1.0.x, you shouldn't have 
-any problems.  However, in the source we have begun a transition
-to use ANSI C++ more and this can make it hard or impossible to
-compile LyX on old or non-conformant compilers. If the compile is
-successfull everything should be just like in 1.0.4. Just run
-"make install", and it will automatically update the necessary
-files, provided that you install LyX the same place as
-an existing version.
+If you upgrade from version 1.1.6, you shouldn't have 
+any problems.
 
 Document transfer
 -----------------
 
 In general, you don't need to convert any documents saved with LyX
-v0.10, v0.12.0 or v1.0.x to use them with LyX v1.1.6.
+v1.1.6 to use them with LyX v1.2.0.
 
-LyX v1.1.6 can read all documents saved with lyx-0.12.0 and later correctly.
-Documents saved with lyx-0.10.x are read correctly up to the old math 
-mode, which is not supported anymore. If you have documents with such 
-math formulas, you convert it using the program COLD, written by Preben 
-Rhandol. COLD can be found at:
+LyX v1.2.0 can read all documents saved with lyx-1.1.6 correctly.
 
-  http://www.pvv.org/~randhol/lyx/COLD/
-  ftp://ftp.lyx.org/pub/lyx/contrib/
+Note that as a consequence to all the changes is that older LyX
+versions will almost certainly fail to read files produced by LyX
+1.2.0.
 
-or at one of LyX archive mirror sites listed in README.
 
-Documents saved with LyX version 1.1.6 can be read correctly by 
-LyX v0.12.0 and v1.0.x, except for new and a couple of changed
-features. A notable exception is the tabular format, which has changed
-in a major way in 1.1.6. No older versions of LyX are able to read
-this new inset.
diff --git a/src/frontends/xforms/forms/Makefile.am b/src/frontends/xforms/forms/Makefile.am
index c9104d071c..381ccf9655 100644
--- a/src/frontends/xforms/forms/Makefile.am
+++ b/src/frontends/xforms/forms/Makefile.am
@@ -1,68 +1,9 @@
 include $(top_srcdir)/config/common.am
 
-SHELL = /bin/sh
+EXTRA_DIST = *.fd *.patch fdfixc.sed fdfixh.sed fdfix.sh makefile.old README
 
-SUFFIXES = .fd
-
-SRCS =  form_aboutlyx.fd \
-	form_bibitem.fd \
-	form_bibtex.fd \
-	form_bibtex.fd \
-	form_browser.fd \
-	form_character.fd \
-	form_citation.fd \
-	form_document.fd \
-	form_error.fd \
-	form_ert.fd \
-	form_external.fd \
-	form_filedialog.fd \
-	form_float.fd \
-	form_forks.fd \
-	form_graphics.fd \
-	form_include.fd \
-	form_index.fd \
-	form_maths_deco.fd \
-	form_maths_delim.fd \
-	form_maths_matrix.fd \
-	form_maths_panel.fd \
-	form_maths_space.fd \
-	form_maths_style.fd \
-	form_minipage.fd \
-	form_paragraph.fd \
-	form_preamble.fd \
-	form_preferences.fd \
-	form_print.fd \
-	form_ref.fd \
-	form_search.fd \
-	form_sendto.fd \
-	form_spellchecker.fd \
-	form_tabular.fd \
-	form_tabular_create.fd \
-	form_texinfo.fd \
-	form_thesaurus.fd \
-	form_toc.fd \
-	form_url.fd
-
-OBJS = $(SRCS:.fd=.C)
-
-#all:
-#	@echo "This is a makefile intended for the maintainer only."
-#	@echo "Only run it if you are absolutely sure about what you"
-#	@echo "are doing."
-
-test: clean $(OBJS)
-
-updatesrc: test
-	for fil in *.C *.h; \
-	do cmp -s $$fil ../$$fil || mv $$fil ..; \
-	done
-	rm -f *.[hHcC] *.bak
-
-.fd.C:
-	${SHELL} ./fdfix.sh $<
-
-clean-local:
-	rm -f *.[hHcC] *.bak fdfixc_modified.sed
-
-distclean-local:
-	rm -f *.orig *.rej *~
+updatesrc:
+	@echo Note:
+	@echo   To update the C files generated from XForms fd files
+	@echo   You shoul go to the source dir and do a
+	@echo        make -f makefile.old updatesrc