--- gnome-panel-2.14.0/applets/fish/GNOME_FishApplet_Factory.server.in.in
+++ gnome-panel-2.14.0/applets/fish/GNOME_FishApplet_Factory.server.in.in
@@ -1,8 +1,8 @@
 <oaf_info>
 
 <oaf_server iid="OAFIID:GNOME_FishApplet_Factory"
-	    type="exe"
-	    location="@LIBEXECDIR@/fish-applet-2">
+	    type="shlib"
+	    location="@LIBDIR@/libfish-applet-2.so">
 
 	<oaf_attribute name="repo_ids" type="stringv">
 		<item value="IDL:Bonobo/GenericFactory:1.0"/>
--- gnome-panel-2.14.0/applets/fish/Makefile.am
+++ gnome-panel-2.14.0/applets/fish/Makefile.am
@@ -9,11 +9,11 @@
 	$(DISABLE_DEPRECATED_CFLAGS)				\
 	$(FISH_CFLAGS)
 
-libexec_PROGRAMS = fish-applet-2
+lib_LTLIBRARIES = libfish-applet-2.la
 
-fish_applet_2_SOURCES = fish.c
+libfish_applet_2_la_SOURCES = fish.c
 
-fish_applet_2_LDADD =					\
+libfish_applet_2_la_LIBADD =				\
 	../../libpanel-applet/libpanel-applet-2.la	\
 	$(FISH_LIBS)
 
@@ -48,7 +48,7 @@
 server_DATA     = $(server_in_files:.server.in=.server)
 
 $(server_in_files): $(server_in_files).in
-	sed -e "s|\@LIBEXECDIR\@|$(libexecdir)|" $< > $@
+	sed -e "s|\@LIBDIR\@|$(libdir)|" $< > $@
 
 CLEANFILES = $(server_DATA) $(server_DATA).in $(schemas_DATA)
 
--- gnome-panel-2.14.0/applets/fish/fish.c
+++ gnome-panel-2.14.0/applets/fish/fish.c
@@ -1842,7 +1842,6 @@
 					      NULL);
 	}
 
-	gtk_window_set_default_icon_name ("gnome-fish");
 	setup_fish_widget (fish);
 
 	return TRUE;
@@ -2026,9 +2025,8 @@
 	return type;
 }
 
-PANEL_APPLET_BONOBO_FACTORY ("OAFIID:GNOME_FishApplet_Factory",
+PANEL_APPLET_BONOBO_SHLIB_FACTORY ("OAFIID:GNOME_FishApplet_Factory",
 			     fish_applet_get_type (),
 			     "That-stupid-fish",
-			     "0",
 			     fishy_factory,
 			     NULL)
--- gnome-panel-2.14.0/applets/notification_area/GNOME_NotificationAreaApplet.server.in.in
+++ gnome-panel-2.14.0/applets/notification_area/GNOME_NotificationAreaApplet.server.in.in
@@ -1,8 +1,8 @@
 <oaf_info>
 
 <oaf_server iid="OAFIID:GNOME_NotificationAreaApplet_Factory"
-	    type="exe"
-	    location="@LIBEXECDIR@/notification-area-applet">
+	    type="shlib"
+	    location="@LIBDIR@/libnotification-area-applet.so">
 
 	<oaf_attribute name="repo_ids" type="stringv">
 		<item value="IDL:Bonobo/GenericFactory:1.0"/>
--- gnome-panel-2.14.0/applets/notification_area/Makefile.am
+++ gnome-panel-2.14.0/applets/notification_area/Makefile.am
@@ -14,13 +14,13 @@
 	-DDATADIR=\"$(datadir)\"				\
 	-DLIBDIR=\"$(libdir)\"
 
-libexec_PROGRAMS = notification-area-applet
+lib_LTLIBRARIES = libnotification-area-applet.la
 
 EGGFILES=			\
 	eggtraymanager.h	\
 	eggtraymanager.c
 
-notification_area_applet_SOURCES =		\
+libnotification_area_applet_la_SOURCES =		\
 	fixedtip.h				\
 	fixedtip.c				\
 	main.c					\
@@ -30,7 +30,7 @@
 	eggmarshalers.h				\
 	eggmarshalers.c
 
-notification_area_applet_LDADD =			\
+libnotification_area_applet_la_LIBADD =			\
 	../../libpanel-applet/libpanel-applet-2.la	\
 	$(X_LIBS)					\
 	$(PANEL_LIBS)
@@ -40,7 +40,7 @@
 server_DATA     = GNOME_NotificationAreaApplet.server
 
 GNOME_NotificationAreaApplet.server.in: $(srcdir)/GNOME_NotificationAreaApplet.server.in.in
-	sed -e "s|\@LIBEXECDIR\@|$(libexecdir)|" $< > $@
+	sed -e "s|\@LIBDIR\@|$(libdir)|" $< > $@
 
 @INTLTOOL_SERVER_RULE@
 
--- gnome-panel-2.14.0/applets/notification_area/main.c
+++ gnome-panel-2.14.0/applets/notification_area/main.c
@@ -384,7 +384,6 @@
   
   gtk_container_add (GTK_CONTAINER (tray->applet), tray->frame);
   
-  gtk_window_set_default_icon_name ("panel-notification-area");
   gtk_widget_show_all (GTK_WIDGET (tray->applet));
   
   panel_applet_setup_menu_from_file (PANEL_APPLET (applet), 
@@ -397,18 +396,8 @@
   return TRUE;
 }
 
-#if 1
-PANEL_APPLET_BONOBO_FACTORY ("OAFIID:GNOME_NotificationAreaApplet_Factory",
-			     PANEL_TYPE_APPLET,
-                             "NotificationArea",
-                             "0",
-                             applet_factory,
-                             NULL)
-
-#else
 
 PANEL_APPLET_BONOBO_SHLIB_FACTORY ("OAFIID:GNOME_NotificationAreaApplet_Factory",
 				   PANEL_TYPE_APPLET,
 				   "NotificationArea",
 				    applet_factory, NULL);
-#endif
--- gnome-panel-2.14.0/applets/wncklet/GNOME_Wncklet_Factory.server.in.in
+++ gnome-panel-2.14.0/applets/wncklet/GNOME_Wncklet_Factory.server.in.in
@@ -1,8 +1,8 @@
 <oaf_info>
 
 <oaf_server iid="OAFIID:GNOME_Wncklet_Factory"
-	    type="exe"
-	    location="@LIBEXECDIR@/wnck-applet">
+	    type="shlib"
+	    location="@LIBDIR@/libwnck-applet.so">
 
 	<oaf_attribute name="repo_ids" type="stringv">
 		<item value="IDL:Bonobo/GenericFactory:1.0"/>
--- gnome-panel-2.14.0/applets/wncklet/Makefile.am
+++ gnome-panel-2.14.0/applets/wncklet/Makefile.am
@@ -1,4 +1,4 @@
-libexec_PROGRAMS = wnck-applet
+lib_LTLIBRARIES = libwnck-applet.la
 
 INCLUDES = \
 	-I$(top_builddir) \
@@ -16,7 +16,7 @@
         -DDATADIR=\"$(datadir)\" \
         -DLIBDIR=\"$(libdir)\"
 
-wnck_applet_SOURCES = \
+libwnck_applet_la_SOURCES = \
 	wncklet.c \
 	wncklet.h \
 	window-menu.c \
@@ -28,9 +28,9 @@
 	showdesktop.c \
 	showdesktop.h
 
-$(wnck_applet_OBJECTS): $(BUILT_SOURCES)
+$(libwnck_applet_la_OBJECTS): $(BUILT_SOURCES)
 
-wnck_applet_LDADD = \
+libwnck_applet_la_LIBADD = \
 	../../libpanel-applet/libpanel-applet-2.la \
 	$(WNCKLET_LIBS)
 
@@ -45,7 +45,7 @@
 server_DATA     = $(server_in_files:.server.in=.server)
 
 $(server_in_files): $(server_in_files).in
-	sed -e "s|\@LIBEXECDIR\@|$(libexecdir)|" $< > $@
+	sed -e "s|\@LIBDIR\@|$(libdir)|" $< > $@
 
 @INTLTOOL_SERVER_RULE@
 
--- gnome-panel-2.14.0/applets/wncklet/wncklet.c
+++ gnome-panel-2.14.0/applets/wncklet/wncklet.c
@@ -222,9 +222,8 @@
 }
 
 
-PANEL_APPLET_BONOBO_FACTORY ("OAFIID:GNOME_Wncklet_Factory",
+PANEL_APPLET_BONOBO_SHLIB_FACTORY ("OAFIID:GNOME_Wncklet_Factory",
                              PANEL_TYPE_APPLET,
                              "WindowNavigationApplets",
-                             "0",
                              wncklet_factory,
                              NULL);