diff --git a/HACKING b/HACKING
new file mode 100644
index 0000000000..726bb615f0
--- /dev/null
+++ b/HACKING
@@ -0,0 +1,21 @@
+If you want to hack on the GIMP project, it will make you life easier
+to have the following packages installed:
+
+	- GNU autoconf 2.12
+	- GNU automake 1.2d
+		Available in ftp://ftp.cygnus.com/pub/tromey
+	- GNU libtool 1.0f
+
+These should be available by ftp from prep.ai.mit.edu or any of the
+fine GNU mirrors.  Beta software can be found at alpha.gnu.org.
+
+If you are accessing gnome via CVS, then you will need to take several
+steps to get it to compile.  These are:
+
+    cvsroot/gimp# aclocal; automake; autoconf
+
+N.b., the "configure" script will not exist until you take these
+steps.  
+
+Before running configure, make sure you have libtool in your path.
+
diff --git a/app/about_dialog.c b/app/about_dialog.c
index 5875d87280..f0cf32b759 100644
--- a/app/about_dialog.c
+++ b/app/about_dialog.c
@@ -48,6 +48,7 @@ static char *scroll_text[] =
   "Francisco Bustamente",
   "Ed Connel",
   "Andreas Dilger",
+  "Misha Dynin",
   "Larry Ewing",
   "David Forsyth",
   "Jim Geuther",
diff --git a/app/dialogs/about-dialog.c b/app/dialogs/about-dialog.c
index 5875d87280..f0cf32b759 100644
--- a/app/dialogs/about-dialog.c
+++ b/app/dialogs/about-dialog.c
@@ -48,6 +48,7 @@ static char *scroll_text[] =
   "Francisco Bustamente",
   "Ed Connel",
   "Andreas Dilger",
+  "Misha Dynin",
   "Larry Ewing",
   "David Forsyth",
   "Jim Geuther",
diff --git a/app/gui/about-dialog.c b/app/gui/about-dialog.c
index 5875d87280..f0cf32b759 100644
--- a/app/gui/about-dialog.c
+++ b/app/gui/about-dialog.c
@@ -48,6 +48,7 @@ static char *scroll_text[] =
   "Francisco Bustamente",
   "Ed Connel",
   "Andreas Dilger",
+  "Misha Dynin",
   "Larry Ewing",
   "David Forsyth",
   "Jim Geuther",
diff --git a/autogen.sh b/autogen.sh
new file mode 100755
index 0000000000..d577dda005
--- /dev/null
+++ b/autogen.sh
@@ -0,0 +1,49 @@
+#!/bin/sh
+# Run this to generate all the initial makefiles, etc.
+
+DIE=0
+
+(autoconf --version) < /dev/null > /dev/null 2>&1 || {
+	echo
+	echo "You must have autoconf installed to compile GIMP."
+	echo "Download the appropriate package for your distribution,"
+	echo "or get the source tarball at ftp://ftp.gnu.org/pub/gnu/"
+	DIE=1
+}
+
+(libtool --version) < /dev/null > /dev/null 2>&1 || {
+	echo
+	echo "You must have libtool installed to compile GIMP."
+	echo "Get ftp://alpha.gnu.org/gnu/libtool-1.0h.tar.gz"
+	echo "(or a newer version if it is available)"
+	DIE=1
+}
+
+(automake --version) < /dev/null > /dev/null 2>&1 || {
+	echo
+	echo "You must have automake installed to compile GIMP."
+	echo "Get ftp://ftp.cygnus.com/pub/home/tromey/automake-1.2f.tar.gz"
+	echo "(or a newer version if it is available)"
+	DIE=1
+}
+
+if test "$DIE" -eq 1; then
+	exit 1
+fi
+
+(test -d app && test -d plug-ins) || {
+	echo "You must run this script in the top-level GIMP directory"
+	exit 1
+}
+
+if test -z "$*"; then
+	echo "I am going to run ./configure with no arguments - if you wish "
+        echo "to pass any to it, please specify them on the $0 command line."
+fi
+
+echo processing...
+(aclocal; automake; autoconf)
+./configure "$@"
+
+echo 
+echo "Now type 'make' to compile GIMP."
diff --git a/configure.in b/configure.in
index 65142f00f4..a25b00d2eb 100644
--- a/configure.in
+++ b/configure.in
@@ -63,11 +63,6 @@ AC_DEFUN(AC_GIMP_CHECK,
 		x_libs="-lXext $x_libs", ,
 		$x_libs)
 
-	dnl FIXME: I have to think of a better way
-	AC_CHECK_LIB(Xmu, XmuClientWindow,
-		x_libs="-lXmu $x_libs", ,
-		$x_libs)
-
 	X_LIBS="$X_LIBS -lgtk -lgdk -lglib $x_libs -lm"
 
  	LDFLAGS="$saved_ldflags $X_LDFLAGS $X_LIBS"
@@ -123,6 +118,13 @@ if eval "test x$GCC = xyes"; then
   fi
 fi
 
+dnl Test for Xmu
+  if test -z "$LIBXMU_LIB"; then
+    AC_CHECK_LIB(Xmu, XmuClientWindow,
+      WEBBROWSER="webbrowser"; LIBXMU_LIB='-lXmu',
+      AC_MSG_WARN(*** webbrowser plug-in will not be built ***))
+  fi
+
 dnl Test for libtiff
   if test -z "$LIBTIFF_LIB"; then
     AC_CHECK_LIB(tiff, TIFFReadScanline,
@@ -241,6 +243,8 @@ AC_PATH_PROG(EMACS, emacs, :)
 AC_SUBST(gimpdir)
 AC_SUBST(gimpdatadir)
 AC_SUBST(gimpplugindir)
+AC_SUBST(WEBBROWSER)
+AC_SUBST(LIBXMU_LIB)
 AC_SUBST(TIFF)
 AC_SUBST(LIBTIFF_LIB)
 AC_SUBST(JPEG)
diff --git a/plug-ins/Makefile.am b/plug-ins/Makefile.am
index b8c65ce15e..814733ef98 100644
--- a/plug-ins/Makefile.am
+++ b/plug-ins/Makefile.am
@@ -6,6 +6,7 @@ SUBDIRS = 			\
 	dbbrowser		\
 	script-fu		\
 	struc			\
+	@WEBBROWSER@		\
 	@TIFF@			\
 	@JPEG@			\
 	@PNG@			\
@@ -112,7 +113,6 @@ SUBDIRS = 			\
 	vinvert			\
 	vpropagate		\
 	waves			\
-	webbrowser		\
 	whirlpinch		\
 	xwd			\
 	zealouscrop
diff --git a/plug-ins/webbrowser/Makefile.am b/plug-ins/webbrowser/Makefile.am
index 8e20b6cbb3..2e9047c427 100644
--- a/plug-ins/webbrowser/Makefile.am
+++ b/plug-ins/webbrowser/Makefile.am
@@ -16,7 +16,7 @@ LDADD = \
 	$(top_builddir)/libgimp/libgimpui.la	\
 	$(top_builddir)/libgimp/libgimp.la	\
 	$(X_LIBS)				\
-					\
+	@LIBXMU_LIB@				\
 	-lc
 
 DEPS = \