diff --git a/plugins/applet/Makefile.am b/plugins/applet/Makefile.am
index bee10ef..3519b62 100644
--- a/plugins/applet/Makefile.am
+++ b/plugins/applet/Makefile.am
@@ -23,7 +23,9 @@ org.gnome.panel.applet.SeahorseAppletFactory.service: $(service_in_files)
             $< > $@
 
 uidir = $(datadir)/gnome-2.0/ui
-ui_DATA = seahorse-applet-preferences.xml
+ui_DATA = \
+	seahorse-applet-preferences.xml \
+	seahorseapplet-menu.xml
 
 INCLUDES = \
 	-I.	\
@@ -33,7 +35,6 @@ INCLUDES = \
 	-I$(top_srcdir)/libseahorse \
 	$(SEAHORSE_CFLAGS) \
 	-DGNOMELOCALEDIR=\"$(localedir)\" \
-	-DSEAHORSE_MENU_UI_DIR=\"$(uidir)\" \
 	-DDATADIR=\""$(datadir)"\" \
 	-DLIBDIR=\""$(libdir)"\" \
 	-DSEAHORSE_UIDIR=\""$(uidir)"\" \
@@ -41,8 +42,7 @@ INCLUDES = \
 	-DPREFIX=\""$(prefix)"\" \
 	-DLIBCRYPTUI_API_SUBJECT_TO_CHANGE
 
-seahorse_appletdir = $(libdir)/seahorse
-seahorse_applet_PROGRAMS = seahorse-applet
+libexec_PROGRAMS = seahorse-applet
 
 seahorse_applet_SOURCES = \
 	seahorse-applet.c \
diff --git a/plugins/applet/org.gnome.applets.SeahorseApplet.panel-applet.in.in b/plugins/applet/org.gnome.applets.SeahorseApplet.panel-applet.in.in
index 8aedce5..d4a0105 100644
--- a/plugins/applet/org.gnome.applets.SeahorseApplet.panel-applet.in.in
+++ b/plugins/applet/org.gnome.applets.SeahorseApplet.panel-applet.in.in
@@ -1,6 +1,6 @@
 [Applet Factory]
 Id=SeahorseAppletFactory
-Location=@LIBEXECDIR@/seahorseapplet
+Location=@LIBEXECDIR@/seahorse-applet
 Name=Seahorse Applet Factory
 Description=Seahorse Applet Factory
 
diff --git a/plugins/applet/org.gnome.panel.applet.SeahorseAppletFactory.service.in b/plugins/applet/org.gnome.panel.applet.SeahorseAppletFactory.service.in
index 66e89fa..c5323fa 100644
--- a/plugins/applet/org.gnome.panel.applet.SeahorseAppletFactory.service.in
+++ b/plugins/applet/org.gnome.panel.applet.SeahorseAppletFactory.service.in
@@ -1,3 +1,3 @@
 [D-BUS Service]
 Name=org.gnome.panel.applet.SeahorseAppletFactory
-Exec=@LIBEXECDIR@/seahorseapplet
+Exec=@LIBEXECDIR@/seahorse-applet
diff --git a/plugins/applet/seahorse-applet.c b/plugins/applet/seahorse-applet.c
index b6eeb0c..f7804d9 100644
--- a/plugins/applet/seahorse-applet.c
+++ b/plugins/applet/seahorse-applet.c
@@ -1022,7 +1022,7 @@ seahorse_applet_fill (PanelApplet *applet)
 				  seahorse_applet_menu_actions,
 				  G_N_ELEMENTS (seahorse_applet_menu_actions),
 				  applet);
-    ui_path = g_build_filename (SEAHORSE_MENU_UI_DIR, "seahorseapplet-menu.xml", NULL);
+    ui_path = g_build_filename (SEAHORSE_UIDIR, "seahorseapplet-menu.xml", NULL);
     panel_applet_setup_menu_from_file (applet, ui_path, action_group);
     g_free (ui_path);
     g_object_unref (action_group);
@@ -1090,8 +1090,8 @@ main (int argc, char *argv [])
     
     gtk_init (&argc, &argv);
     
-    retval =  panel_applet_factory_main ("SeahorseAppletFactory", 
-                                      SEAHORSE_TYPE_APPLET, "SeahorseApplet",
+    retval =  panel_applet_factory_main ("SeahorseAppletFactory", TRUE,
+                                      SEAHORSE_TYPE_APPLET,
                                       seahorse_applet_factory, NULL);
                                       
     g_option_context_free (context);
