diff --git a/src/Makefile.am b/src/Makefile.am
index 3ed60b43c..1970e85f3 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -165,7 +165,7 @@ libgnome_shell_la_LIBADD =	\
 libgnome_shell_la_CPPFLAGS = $(gnome_shell_cflags)
 
 typelibdir = $(pkglibdir)
-typelib_DATA = Shell-0.1.typelib Big-1.0.typelib St-1.0.typelib
+typelib_DATA = Shell-0.1.typelib Big-1.0.typelib St-1.0.typelib Gdm-1.0.typelib
 
 Shell-0.1.gir: $(mutter) $(G_IR_SCANNER) Big-1.0.gir St-1.0.gir libgnome-shell.la Makefile
 	$(AM_V_GEN) $(G_IR_SCANNER)			\
@@ -237,3 +237,22 @@ St-1.0.typelib: St-1.0.gir
 		$< -o $@
 
 CLEANFILES += St-1.0.typelib
+
+Gdm-1.0.gir: $(mutter) $(G_IR_SCANNER) libgdmuser-1.0.la Makefile
+	$(AM_V_GEN) $(G_IR_SCANNER)			\
+		--namespace=Gdm				\
+		--nsversion=1.0				\
+		--include=GObject-2.0			\
+		--include=GdkPixbuf-2.0			\
+		--libtool="$(LIBTOOL)"			\
+		--library=libgdmuser-1.0.la		\
+		$(addprefix $(srcdir)/,$(gdmuser_source_h))	\
+		$(addprefix $(srcdir)/,$(gdmuser_source_c))	\
+		$(gdmuser_cflags)				\
+		-o $@
+CLEANFILES += Gdm-1.0.gir
+
+Gdm-1.0.typelib: libbig-1.0.la Gdm-1.0.gir
+	$(AM_V_GEN) $(G_IR_COMPILER) Gdm-1.0.gir -o $@
+CLEANFILES += Gdm-1.0.typelib
+
diff --git a/src/gdmuser/gdm-user-manager.c b/src/gdmuser/gdm-user-manager.c
index 167ca7d55..e636b3564 100644
--- a/src/gdmuser/gdm-user-manager.c
+++ b/src/gdmuser/gdm-user-manager.c
@@ -998,7 +998,7 @@ gdm_user_manager_get_user (GdmUserManager *manager,
 
 GdmUser *
 gdm_user_manager_get_user_by_uid (GdmUserManager *manager,
-                                  uid_t           uid)
+                                  gulong          uid)
 {
         GdmUser       *user;
         struct passwd *pwent;
diff --git a/src/gdmuser/gdm-user-manager.h b/src/gdmuser/gdm-user-manager.h
index 6c696e585..bb1118090 100644
--- a/src/gdmuser/gdm-user-manager.h
+++ b/src/gdmuser/gdm-user-manager.h
@@ -75,7 +75,7 @@ GSList *            gdm_user_manager_list_users            (GdmUserManager *mana
 GdmUser *           gdm_user_manager_get_user              (GdmUserManager *manager,
                                                             const char     *user_name);
 GdmUser *           gdm_user_manager_get_user_by_uid       (GdmUserManager *manager,
-                                                            uid_t           uid);
+                                                            gulong          uid);
 
 gboolean            gdm_user_manager_activate_user_session (GdmUserManager *manager,
                                                             GdmUser        *user);
diff --git a/src/gdmuser/gdm-user.c b/src/gdmuser/gdm-user.c
index 4accb56ed..940c6877b 100644
--- a/src/gdmuser/gdm-user.c
+++ b/src/gdmuser/gdm-user.c
@@ -516,7 +516,7 @@ _gdm_user_icon_changed (GdmUser *user)
  * Since: 1.0
  **/
 
-uid_t
+gulong
 gdm_user_get_uid (GdmUser *user)
 {
         g_return_val_if_fail (GDM_IS_USER (user), -1);
diff --git a/src/gdmuser/gdm-user.h b/src/gdmuser/gdm-user.h
index 4edd3baf4..ee5dc509b 100644
--- a/src/gdmuser/gdm-user.h
+++ b/src/gdmuser/gdm-user.h
@@ -39,7 +39,7 @@ typedef struct _GdmUser GdmUser;
 
 GType                 gdm_user_get_type            (void) G_GNUC_CONST;
 
-uid_t                 gdm_user_get_uid             (GdmUser   *user);
+gulong                gdm_user_get_uid             (GdmUser   *user);
 G_CONST_RETURN char  *gdm_user_get_user_name       (GdmUser   *user);
 G_CONST_RETURN char  *gdm_user_get_real_name       (GdmUser   *user);
 G_CONST_RETURN char  *gdm_user_get_home_directory  (GdmUser   *user);