diff --git a/ChangeLog b/ChangeLog
index 3069ba9907..2b14c600bb 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,11 @@
 2004-10-25  Sven Neumann  <sven@gimp.org>
 
-	* configure.in
+	* configure.in: gimp_user_version should be 2.2.
+
+	* libgimpmodule/Makefile.am (AM_CPPFLAGS): cleanup.
+
+2004-10-25  Sven Neumann  <sven@gimp.org>
+
 	* app/Makefile.am
 	* tools/Makefile.am: bumped version to 2.2.0-pre1, set app version
 	to 2.2, reset other versions to 2.0. Changed library versioning so
diff --git a/configure.in b/configure.in
index 764c9ef7e7..49c23002ff 100644
--- a/configure.in
+++ b/configure.in
@@ -34,7 +34,7 @@ m4_define([gimp_tool_version], [2.0])
 m4_define([gimp_pkgconfig_version], [2.0])
 m4_define([gimp_data_version], [2.0])
 m4_define([gimp_sysconf_version], [2.0])
-m4_define([gimp_user_version], [2.0])
+m4_define([gimp_user_version], [2.2])
 
 m4_define([gimp_unstable],
           m4_if(m4_eval(gimp_minor_version % 2), [1], [yes], [no]))
diff --git a/docs/.cvsignore b/docs/.cvsignore
index 09de43a02f..ee394b7106 100644
--- a/docs/.cvsignore
+++ b/docs/.cvsignore
@@ -4,7 +4,7 @@ Makefile.in
 gimp-2.2.1
 gimprc-2.2.5
 gimp-remote-2.2.1
-gimptool-2.2.1
+gimptool-2.0.1
 Wilber.xcf
 Wilber_Construction_Kit.xcf
 quick_reference
diff --git a/libgimpmodule/Makefile.am b/libgimpmodule/Makefile.am
index 325cdd6386..dc51e50c78 100644
--- a/libgimpmodule/Makefile.am
+++ b/libgimpmodule/Makefile.am
@@ -42,23 +42,17 @@ endif
 libgimpmoduleincludedir = $(includedir)/gimp-$(GIMP_API_VERSION)/libgimpmodule
 
 AM_CPPFLAGS = \
-	-DPREFIX=\""$(prefix)"\"		\
-	-DGIMPDIR=\""$(gimpdir)"\"		\
-	-DDATADIR=\""$(gimpdatadir)"\"		\
-	-DLOCALEDIR=\""$(localedir)"\"		\
-	-DPLUGINDIR=\""$(gimpplugindir)"\"	\
-	-DSYSCONFDIR=\""$(gimpsysconfdir)"\"	\
 	-DG_LOG_DOMAIN=\"LibGimpModule\"	\
 	@GIMP_THREAD_FLAGS@
 
 INCLUDES = \
-	-I$(top_srcdir)	\
-	$(GLIB_CFLAGS) \
-	$(GMODULE_CFLAGS) \
+	-I$(top_srcdir)		\
+	$(GLIB_CFLAGS)		\
+	$(GMODULE_CFLAGS)	\
 	-I$(includedir)
 
 EXTRA_DIST = \
-	makefile.msc	\
+	makefile.msc		\
 	gimpmodule.def
 
 lib_LTLIBRARIES = libgimpmodule-2.0.la