diff --git a/src/include/grp.h b/src/include/grp.h
index 514a8bba..580fefe2 100644
--- a/src/include/grp.h
+++ b/src/include/grp.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: grp.h,v 1.4 2002/02/16 21:27:17 millert Exp $	*/
+/*	$OpenBSD: grp.h,v 1.5 2002/04/22 21:28:49 millert Exp $	*/
 /*	$NetBSD: grp.h,v 1.7 1995/04/29 05:30:40 cgd Exp $	*/
 
 /*-
@@ -54,7 +54,7 @@
 struct group {
 	char	*gr_name;		/* group name */
 	char	*gr_passwd;		/* group password */
-	int	gr_gid;			/* group id */
+	gid_t	gr_gid;			/* group id */
 	char	**gr_mem;		/* group members */
 };
 
diff --git a/src/include/pwd.h b/src/include/pwd.h
index 41c36179..65fc56a0 100644
--- a/src/include/pwd.h
+++ b/src/include/pwd.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: pwd.h,v 1.13 2002/02/16 21:27:17 millert Exp $	*/
+/*	$OpenBSD: pwd.h,v 1.14 2002/04/22 21:28:49 millert Exp $	*/
 /*	$NetBSD: pwd.h,v 1.9 1996/05/15 21:36:45 jtc Exp $	*/
 
 /*-
@@ -85,7 +85,7 @@ struct passwd {
 	char	*pw_name;		/* user name */
 	char	*pw_passwd;		/* encrypted password */
 	uid_t	pw_uid;			/* user uid */
-	uid_t	pw_gid;			/* user gid */
+	gid_t	pw_gid;			/* user gid */
 	time_t	pw_change;		/* password change time */
 	char	*pw_class;		/* user access class */
 	char	*pw_gecos;		/* Honeywell login info */