diff --git a/configure.in b/configure.in
index d59a264c5..c1f62803f 100644
--- a/configure.in
+++ b/configure.in
@@ -119,7 +119,7 @@ dnl ==============================================
 GNOMECC_CAPPLETS_CFLAGS="${CAPPLET_CFLAGS} -I\$(top_srcdir)/intl -I\$(top_srcdir)/ -DG_LOG_DOMAIN=\"\\\"\$(cappletname)-properties\\\"\" -DGLADE_DATADIR=\"\\\"${datadir}/control-center\\\"\" -DGNOMELOCALEDIR=\"\\\"${datadir}/locale\\\"\" -I\$(top_srcdir)/capplets/common "
 GNOMECC_CAPPLETS_LIBS="${CAPPLET_LIBS} \$(top_builddir)/capplets/common/libcommon.a"
 GNOMECC_CAPPLETS_CLEANFILES="\$(desktop) \$(desktop).in"
-GNOMECC_CAPPLETS_EXTRA_DIST="ChangeLog \$(desktop).in.in \$(desktop).in \$(desktop) \$(cappletname)-capplet.png \$(cappletname)-properties.glade \$(pixmaps_DATA)"
+GNOMECC_CAPPLETS_EXTRA_DIST="ChangeLog \$(desktop).in.in \$(cappletname)-capplet.png \$(cappletname)-properties.glade \$(pixmaps_DATA)"
 
 AC_SUBST(GNOMECC_CAPPLETS_EXTRA_DIST)
 AC_SUBST(GNOMECC_CAPPLETS_CLEANFILES)
@@ -163,7 +163,7 @@ GNOMECC_CAPPLETS_DESKTOP_IN_RULE='$(desktop).in: \%.desktop.in: \%.desktop.in.in
 \
 install-data-local:\
 	$(mkinstalldirs) $(datadir)/control-center/capplets/$(cappletgroup)\
-	$(INSTALL_DATA) $(srcdir)/$(desktop) $(datadir)/control-center/capplets/$(cappletgroup)$(desktop)\
+	$(INSTALL_DATA) $(desktop) $(datadir)/control-center/capplets/$(cappletgroup)$(desktop)\
 install-data-am: install-data-local'
 AC_DIVERT_PUSH(AC_DIVERSION_SED)dnl
 s%@GNOMECC_CAPPLETS_DESKTOP_IN_RULE@%[$]GNOMECC_CAPPLETS_DESKTOP_IN_RULE%g
diff --git a/control-center/Makefile.am b/control-center/Makefile.am
index 66beccbe0..7695710ec 100644
--- a/control-center/Makefile.am
+++ b/control-center/Makefile.am
@@ -66,6 +66,28 @@ $(groups_files): %.directory: %.directory.in
 
 install-data-local:
 	$(mkinstalldirs) $(datadir)/control-center/capplets
-	$(INSTALL_DATA) $(srcdir)/Gnome.directory $(datadir)/control-center/capplets/.directory
+	$(INSTALL_DATA) Gnome.directory $(datadir)/control-center/capplets/.directory
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
 
 #all-local: Gnome.directory
\ No newline at end of file
diff --git a/po/POTFILES.in b/po/POTFILES.in
index d1bce0c2e..58c3faff4 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -73,7 +73,7 @@ control-center/gnomecc.desktop.in
 control-center/gnomecc.glade
 
 capplets/desktop-links/gnome-hint-properties.desktop.in
-capplets/desktop-links/Sawfish/Sawfish.directory.in
+capplets/desktop-links/Sawfish/Sawfish.directory.in.in
 capplets/desktop-links/Sawfish/appearance-properties.desktop.in
 capplets/desktop-links/Sawfish/bindings-properties.desktop.in
 capplets/desktop-links/Sawfish/focus-properties.desktop.in