diff --git a/lib/sugar/Makefile.am b/lib/sugar/Makefile.am
index a88d23a1..69ba27b8 100644
--- a/lib/sugar/Makefile.am
+++ b/lib/sugar/Makefile.am
@@ -35,7 +35,7 @@ _sugarext_la_SOURCES =			\
 	sugar-x11-util.c		\
 	sugar-x11-util.h
 
-nodist__sugarext_la_SOURCES = 		\
+BUILT_SOURCES = 			\
 	_sugarext.c			\
 	sugar-marshal.c			\
 	sugar-marshal.h
@@ -52,23 +52,13 @@ _sugarext.c: _sugarext.defs _sugarext.override
 	&& cp gen-$*.c $*.c \
 	&& rm -f gen-$*.c
 	
-stamp_files = 			\
-	stamp-sugar-marshal.c	\
-	stamp-sugar-marshal.h
-
-sugar-marshal.c: stamp-sugar-marshal.c
-	@true
-stamp-sugar-marshal.c: sugar-marshal.list
+sugar-marshal.c: sugar-marshal.list
 	$(GLIB_GENMARSHAL) --prefix=sugar_marshal \
-		$(srcdir)/sugar-marshal.list --header --body > \
-		sugar-marshal.c && echo timestamp > $(@F)
+		$(srcdir)/sugar-marshal.list --header --body > sugar-marshal.c
 
-sugar-marshal.h: stamp-sugar-marshal.h
-	@true
-stamp-sugar-marshal.h: sugar-marshal.list
+sugar-marshal.h: sugar-marshal.list
 	$(GLIB_GENMARSHAL) --prefix=sugar_marshal \
-		$(srcdir)/sugar-marshal.list --header > \
-		sugar-marshal.h && echo timestamp > $(@F)
+		$(srcdir)/sugar-marshal.list --header > sugar-marshal.h
 
-CLEANFILES = $(stamp_files)
+CLEANFILES = $(BUILT_SOURCES)
 EXTRA_DIST = sugar-marshal.list _sugarext.defs _sugarext.override
diff --git a/po/POTFILES.in b/po/POTFILES.in
index bbea3f02..8aec2664 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -1,7 +1,6 @@
 shell/intro/intro.py
 shell/view/BuddyMenu.py
 shell/view/clipboardmenu.py
-services/shell/objecttypeservice.py
 shell/hardware/keydialog.py
 shell/view/home/activitiesdonut.py
 shell/view/Shell.py
@@ -9,7 +8,8 @@ shell/view/clipboardicon.py
 shell/view/home/HomeBox.py
 shell/view/home/MeshBox.py
 shell/view/devices/battery.py
-sugar/activity/activity.py
 shell/view/devices/network/wireless.py
 shell/view/frame/activitybutton.py
 shell/view/frame/zoomtoolbar.py
+services/shell/objecttypeservice.py
+lib/sugar/activity/activity.py