diff --git a/ChangeLog b/ChangeLog
index 81d7c05cbc..7f5bbf54fb 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Fri Apr  7 11:54:25 PDT 2000 Manish Singh <yosh@gimp.org>
+
+	* app/Makefile.am
+	* app/main.c
+	* app/user_install.[ch]: renamed install.[ch]
+
 2000-04-06  Sven Neumann  <sven@gimp.org>
 
 	* libgimp/gimplimits.h: changed GIMP_MIN_RESOLUTION to 5e-3 so 
diff --git a/MAINTAINERS b/MAINTAINERS
index 45d05436e5..f4e078c996 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -1,10 +1,3 @@
-Name: 
-Email:
-url:
-expertise:
-current work:
-commit access:
-
 Name: Matt Wilson
 Email: msw@gimp.org
 url:
@@ -38,15 +31,6 @@ expertise: resolution stuff, modules, colour selectors, fonts, PostScript
 current work:  random bug fixes, resolution
 commit access: yes
 
-Name: ray lehtiniemi
-Email: rayl@mail.com
-url: http://www.netrover.com/~rayl/
-ircnick: rayl
-expertise:  bit of everything, moreso in the lowest levels like
-            paint_funcs and pixel_region and tilemanagers
-current work: HOLLYWOOD branch  (film and deep image stuff)
-commit access: yes
-
 Name: Sven Neuman
 Email: sven@gimp.org
 url: http://sven.gimp.org
@@ -177,13 +161,6 @@ Email: njl195@zepler.org.uk
 ircnick: ruth
 expertise: Script-fu extensions, tiff plugin
 current work: 
-commit access: no
-
-Name: Gregory McLean
-Email: gregm@comstar.net
-ircnick: Centove
-expertise: rpm specs file (and probably some more ;)
-current work: gimp.specs file
 commit access: yes
 
 Name: Michael Natterer
@@ -202,11 +179,3 @@ current work: I fell into this rabbit hole by writing highly verbose patch docum
 which just goes to show that succinctness is its own reward. My patch documentation 
 archive is http://idt.net/~gosgood/gimp-patch/
 commit access: yes
-
-Name:  Daniel Egger
-Email: Daniel.Egger@suse.de
-url:
-expertise: Localisation, optimisation, cleanup.
-current work: Cleaning up the code base while trying to find a
-              proper solution for localisation.
-commit access: no
diff --git a/app/Makefile.am b/app/Makefile.am
index f537329ca5..07404515ca 100644
--- a/app/Makefile.am
+++ b/app/Makefile.am
@@ -262,8 +262,6 @@ gimp_SOURCES = \
 	info_window.h		\
 	ink.c                   \
 	ink.h		        \
-	install.c		\
-	install.h		\
 	interface.c		\
 	interface.h		\
 	interface_cmds.c	\
@@ -426,6 +424,8 @@ gimp_SOURCES = \
 	undo_types.h		\
 	unitrc.h		\
 	unit_cmds.c		\
+	user_install.c		\
+	user_install.h		\
 	wilber.h		\
 	xcf.c			\
 	xcf.h
diff --git a/app/dialogs/user-install-dialog.c b/app/dialogs/user-install-dialog.c
index c17a1fc4d1..9e8347f17d 100644
--- a/app/dialogs/user-install-dialog.c
+++ b/app/dialogs/user-install-dialog.c
@@ -28,11 +28,11 @@
 #endif
 
 #include "appenv.h"
-#include "install.h"
 #include "gdisplay_ops.h"
 #include "gimprc.h"
 #include "gimpui.h"
 #include "unitrc.h"
+#include "user_install.h"
 
 #include "libgimp/gimpenv.h"
 #include "libgimp/gimplimits.h"
diff --git a/app/gui/user-install-dialog.c b/app/gui/user-install-dialog.c
index c17a1fc4d1..9e8347f17d 100644
--- a/app/gui/user-install-dialog.c
+++ b/app/gui/user-install-dialog.c
@@ -28,11 +28,11 @@
 #endif
 
 #include "appenv.h"
-#include "install.h"
 #include "gdisplay_ops.h"
 #include "gimprc.h"
 #include "gimpui.h"
 #include "unitrc.h"
+#include "user_install.h"
 
 #include "libgimp/gimpenv.h"
 #include "libgimp/gimplimits.h"
diff --git a/app/install.c b/app/install.c
index c17a1fc4d1..9e8347f17d 100644
--- a/app/install.c
+++ b/app/install.c
@@ -28,11 +28,11 @@
 #endif
 
 #include "appenv.h"
-#include "install.h"
 #include "gdisplay_ops.h"
 #include "gimprc.h"
 #include "gimpui.h"
 #include "unitrc.h"
+#include "user_install.h"
 
 #include "libgimp/gimpenv.h"
 #include "libgimp/gimplimits.h"
diff --git a/app/main.c b/app/main.c
index 67724db71a..2ada7720c9 100644
--- a/app/main.c
+++ b/app/main.c
@@ -43,7 +43,7 @@
 #include "appenv.h"
 #include "app_procs.h"
 #include "errors.h"
-#include "install.h"
+#include "user_install.h"
 
 #include "libgimp/gimpintl.h"
 
diff --git a/app/user_install.c b/app/user_install.c
index c17a1fc4d1..9e8347f17d 100644
--- a/app/user_install.c
+++ b/app/user_install.c
@@ -28,11 +28,11 @@
 #endif
 
 #include "appenv.h"
-#include "install.h"
 #include "gdisplay_ops.h"
 #include "gimprc.h"
 #include "gimpui.h"
 #include "unitrc.h"
+#include "user_install.h"
 
 #include "libgimp/gimpenv.h"
 #include "libgimp/gimplimits.h"
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 2d53b5bd00..10275b393d 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -65,7 +65,6 @@ app/indicator_area.c
 app/info_dialog.c
 app/info_window.c
 app/ink.c
-app/install.c
 app/interface.c
 app/internal_procs.c
 app/invert.c
@@ -112,6 +111,7 @@ app/transform_core.c
 app/transform_tool.c
 app/undo.c
 app/undo_history.c
+app/user_install.c
 app/xcf.c
 modules/cdisplay_gamma.c
 modules/colorsel_gtk.c