diff --git a/capplets/about-me/ChangeLog b/capplets/about-me/ChangeLog
index be1978e6c..36a4b46dc 100644
--- a/capplets/about-me/ChangeLog
+++ b/capplets/about-me/ChangeLog
@@ -1,3 +1,12 @@
+2007-02-07  Jens Granseuer  <jensgr@gmx.net>
+
+	* Makefile.am:
+	* gnome-about-me-password.c: (passdlg_set_auth_state),
+	(passdlg_validate_passwords):
+	* gnome-about-me.c: (about_me_load_string_field),
+	(about_me_setup_dialog): fix build in general, with gcc 2 in particular,
+	and also get rid of a few warnings
+
 2007-01-22  Rodrigo Moya <rodrigo@gnome-db.org>
 
 	Fixes #376079
diff --git a/capplets/about-me/Makefile.am b/capplets/about-me/Makefile.am
index 2d329395b..23a9954f8 100644
--- a/capplets/about-me/Makefile.am
+++ b/capplets/about-me/Makefile.am
@@ -26,9 +26,16 @@ desktopdir = $(datadir)/applications
 Desktop_in_files = gnome-about-me.desktop.in
 desktop_DATA = $(Desktop_in_files:.desktop.in=.desktop)
 
-Gladedir   = $(pkgdatadir)/glade
-Glade_DATA = gnome-about-me.glade
+gladedir   = $(pkgdatadir)/glade
+glade_DATA = gnome-about-me.glade
+
+INCLUDES = \
+	$(GNOMECC_CAPPLETS_CFLAGS) \
+	$(LIBEBOOK_CFLAGS) \
+	-DGNOMECC_DATA_DIR="\"$(pkgdatadir)\"" \
+	-DGNOMECC_GLADE_DIR="\"$(gladedir)\"" \
+	-DGNOMECC_PIXMAP_DIR="\"$(pixmapdir)\"" \
+	-DGNOMELOCALEDIR="\"$(datadir)/locale\""
 
-INCLUDES   = $(GNOMECC_CAPPLETS_CFLAGS) $(LIBEBOOK_CFLAGS)
 CLEANFILES = $(GNOMECC_CAPPLETS_CLEANFILES) $(Desktop_in_files) $(desktop_DATA)
-EXTRA_DIST = $(Glade_DATA) $(pixmap_DATA)
+EXTRA_DIST = $(glade_DATA) $(pixmap_DATA)
diff --git a/capplets/about-me/gnome-about-me-password.c b/capplets/about-me/gnome-about-me-password.c
index 62390aa27..1c77941c9 100644
--- a/capplets/about-me/gnome-about-me-password.c
+++ b/capplets/about-me/gnome-about-me-password.c
@@ -738,7 +738,7 @@ passdlg_set_auth_state (PasswordDialog *pdialog, gboolean state)
 		gtk_widget_grab_focus (GTK_WIDGET (pdialog->new_password));
 		
 		/* Set open lock image */
-		gtk_image_set_from_file (GTK_IMAGE (pdialog->dialog_image), GNOMECC_DATA_DIR "/pixmaps/gnome-about-me-lock-open.png");
+		gtk_image_set_from_file (GTK_IMAGE (pdialog->dialog_image), GNOMECC_PIXMAP_DIR "/gnome-about-me-lock-open.png");
 	} else {
 		/* Not authenticated state */
 		
@@ -746,7 +746,7 @@ passdlg_set_auth_state (PasswordDialog *pdialog, gboolean state)
 		gtk_widget_grab_focus (GTK_WIDGET (pdialog->current_password));
 		
 		/* Set closed lock image */
-		gtk_image_set_from_file (GTK_IMAGE (pdialog->dialog_image), GNOMECC_DATA_DIR "/pixmaps/gnome-about-me-lock.png");
+		gtk_image_set_from_file (GTK_IMAGE (pdialog->dialog_image), GNOMECC_PIXMAP_DIR "/gnome-about-me-lock.png");
 	}
 }
 
@@ -833,7 +833,6 @@ passdlg_validate_passwords (PasswordDialog *pdialog)
 	GladeXML		*dialog;
 	const gchar	*new_password, *retyped_password;
 	glong			nlen, rlen;
-	gboolean 		valid = FALSE;
 	
 	dialog = pdialog->xml;
 	
diff --git a/capplets/about-me/gnome-about-me.c b/capplets/about-me/gnome-about-me.c
index 8bfdb1e3c..23ff099f9 100644
--- a/capplets/about-me/gnome-about-me.c
+++ b/capplets/about-me/gnome-about-me.c
@@ -369,7 +369,7 @@ about_me_load_string_field (GnomeAboutMe *me, const gchar *wid, guint cid, guint
 {
 	GtkWidget *widget;
 	GladeXML  *dialog;
-	gchar     *str;
+	const gchar *str;
 
 	dialog = me->dialog;
 
@@ -727,6 +727,7 @@ about_me_setup_dialog (void)
 	struct passwd *pwent;
 	char *user = NULL;
 	gchar *str;
+	gchar **tok;
 
 	me = g_new0 (GnomeAboutMe, 1);
 
@@ -802,7 +803,6 @@ about_me_setup_dialog (void)
 				_("Unknown login ID, the user database might be corrupted"));
 		return -1;
 	}
-	gchar **tok;
 	tok = g_strsplit (pwent->pw_gecos, ",", 0);
 
 	/************************************************/