--- old/client/Makefile.am	Sat Feb  2 09:21:30 2002
+++ new/client/Makefile.am	Sun Mar 10 18:00:21 2002
@@ -4,6 +4,9 @@
 ##    SUBDIRS = @gui_sources@
 ## but that doesn't work properly for "make dist"
 
+if CLIENT_GUI_GTK_2_0
+GUI_SUBDIR = gui-gtk-2.0
+endif
 if CLIENT_GUI_GTK
 GUI_SUBDIR = gui-gtk
 endif
--- old/configure.in	Wed Feb  6 17:47:54 2002
+++ new/configure.in	Sun Mar 10 18:04:17 2002
@@ -316,6 +316,22 @@
     AC_CHECKING([for which client to compile:])
   fi
 
+  dnl Gtk-2.0-specific overrides
+  if test "$client" = "gtk-2.0" || test "$client" = yes ; then
+    AM_PATH_GTK_2_0(2.0.0, gtk_2_0_found="yes", gtk2_0_found="")
+    if test "x$gtk_2_0_found" = "xyes"; then
+      CLIENT_CFLAGS="$GTK_CFLAGS"
+      CLIENT_LIBS="$GTK_LIBS"
+      found_client=yes
+    fi
+
+    if test "x$found_client" = "xyes"; then
+      client="gtk-2.0"
+    elif test "$client" = "gtk-2.0"; then
+      AC_MSG_ERROR(specified client 'gtk-2.0' not configurable)
+    fi
+  fi
+
   dnl Gtk-specific overrides
   if test "$client" = gtk || test "$client" = yes ; then
     AM_PATH_GTK(1.2.5, gtk_found="yes", gtk_found="", imlib_found="")
@@ -469,6 +485,7 @@
 AC_SUBST(gui_sources)
 AC_SUBST(CLIENT_CFLAGS)
 AC_SUBST(CLIENT_LIBS)
+AM_CONDITIONAL(CLIENT_GUI_GTK_2_0, test "$gui_sources" = "gui-gtk-2.0")
 AM_CONDITIONAL(CLIENT_GUI_GTK, test "$gui_sources" = "gui-gtk")
 AM_CONDITIONAL(CLIENT_GUI_XAW, test "$gui_sources" = "gui-xaw")
 AM_CONDITIONAL(CLIENT_GUI_BEOS, test "$gui_sources" = "gui-beos")
@@ -774,6 +791,7 @@
 	  client/agents/Makefile
 	  client/include/Makefile 
 	  client/gui-gtk/Makefile 
+	  client/gui-gtk-2.0/Makefile
 	  client/gui-xaw/Makefile 
 	  client/gui-win32/Makefile 
 	  client/gui-stub/Makefile 
--- old/data/Makefile.am	Thu Jan 25 19:39:38 2001
+++ new/data/Makefile.am	Sun Mar 10 17:51:51 2002
@@ -3,6 +3,7 @@
 pkgdata_DATA = \
 	Freeciv	\
 	freeciv.rc	\
+	freeciv.rc-2.0	\
 	engels.tilespec	\
 	engels_shields.tilespec	\
 	trident.tilespec	\