diff --git a/src/Makefile-gdmuser.am b/src/Makefile-gdmuser.am
new file mode 100644
index 000000000..a12296081
--- /dev/null
+++ b/src/Makefile-gdmuser.am
@@ -0,0 +1,34 @@
+gdmuser_cflags =					\
+	-I$(top_srcdir)/src			\
+	-DPREFIX=\""$(prefix)"\"		\
+	-DLIBDIR=\""$(libdir)"\"		\
+	-DDATADIR=\""$(datadir)"\"		\
+	-DG_DISABLE_DEPRECATED			\
+	-DG_LOG_DOMAIN=\"GdmUser\"			\
+	$(GDMUSER_CFLAGS)			\
+	$(NULL)
+
+# please, keep this sorted alphabetically
+gdmuser_source_h =					\
+	gdmuser/gdm-user.h				\
+	gdmuser/gdm-user-private.h	\
+	gdmuser/gdm-user-manager.h	\
+	$(NULL)
+
+# please, keep this sorted alphabetically
+gdmuser_source_c =					\
+	gdmuser/gdm-user.c			\
+	gdmuser/gdm-user-manager.c			\
+	$(NULL)
+
+noinst_LTLIBRARIES += libgdmuser-1.0.la
+
+libgdmuser_1_0_la_LIBADD = $(GDMUSER_LIBS)
+libgdmuser_1_0_la_SOURCES = \
+	$(gdmuser_source_c) \
+	$(gdmuser_source_h) \
+	$(NULL)
+libgdmuser_1_0_la_CPPFLAGS = $(gdmuser_cflags)
+libgdmuser_1_0_la_LDFLAGS = $(LDADD)
+
+
diff --git a/src/shell-status-menu.c b/src/shell-status-menu.c
index 1bde43770..a1e0d6af6 100644
--- a/src/shell-status-menu.c
+++ b/src/shell-status-menu.c
@@ -448,8 +448,8 @@ menuitem_style_set_cb (GtkWidget     *menuitem,
 static void
 on_deactivate (GtkMenuShell *menushell, gpointer user_data)
 {
-  ShellStatusMenu *shell = SHELL_STATUS_MENU (user_data);
-  g_signal_emit (G_OBJECT (shell), shell_status_menu_signals[DEACTIVATED], 0);
+  ShellStatusMenu *status = SHELL_STATUS_MENU (user_data);
+  g_signal_emit (G_OBJECT (status), shell_status_menu_signals[DEACTIVATED], 0);
 }
 
 static void