diff -ruN --exclude=CVS /usr/ports/sysutils/gnome-system-tools/Makefile /fileserver/ports/sysutils/gnome-system-tools/Makefile
--- /usr/ports/sysutils/gnome-system-tools/Makefile	Tue Apr 10 14:05:02 2007
+++ /fileserver/ports/sysutils/gnome-system-tools/Makefile	Sat Apr 28 20:11:09 2007
@@ -5,8 +5,9 @@
 # $FreeBSD: ports/sysutils/gnome-system-tools/Makefile,v 1.23 2007/04/10 17:05:02 ahze Exp $
 #    $MCom: ports/sysutils/gnome-system-tools/Makefile,v 1.59 2007/03/12 12:55:31 ahze Exp $
 
-PORTNAME=	gnome-system-tools
+PORTNAME=	gnome
 PORTVERSION=	2.18.1
+PORTREVISION=	1
 CATEGORIES=	sysutils gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/gnome-system-tools/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
@@ -16,6 +17,7 @@
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	Tools to configure workstations
+PKGNAMESUFFIX=-system-tools
 LIB_DEPENDS=	oobs-1.3:${PORTSDIR}/devel/liboobs
 
 USE_BZIP2=	yes
diff -ruN --exclude=CVS /usr/ports/sysutils/gnome-system-tools/files/patch-user-settings.c /fileserver/ports/sysutils/gnome-system-tools/files/patch-user-settings.c
--- /usr/ports/sysutils/gnome-system-tools/files/patch-user-settings.c	Wed Dec 31 21:00:00 1969
+++ /fileserver/ports/sysutils/gnome-system-tools/files/patch-user-settings.c	Sun Apr 22 23:35:05 2007
@@ -0,0 +1,15 @@
+--- src/users/user-settings.c.orig	Sun Apr 22 23:32:58 2007
++++ src/users/user-settings.c	Sun Apr 22 23:34:18 2007
+@@ -632,10 +632,10 @@
+ 		password_changed = GPOINTER_TO_INT (g_object_get_data (G_OBJECT (widget), "changed"));
+ 
+ 		if (password_changed)
+-			oobs_user_set_password (user, gtk_entry_get_text (GTK_ENTRY (widget)));
++			oobs_user_set_crypted_password (user, gtk_entry_get_text (GTK_ENTRY (widget)));
+ 	} else {
+ 		widget = gst_dialog_get_widget (tool->main_dialog, "user_settings_random_passwd");
+-		oobs_user_set_password (user, gtk_entry_get_text (GTK_ENTRY (widget)));
++		oobs_user_set_crypted_password (user, gtk_entry_get_text (GTK_ENTRY (widget)));
+ 	}
+ 
+ 	group = get_main_group (oobs_user_get_login_name (user));