diff --git a/ChangeLog b/ChangeLog
index c8b6dc060..201de8eb9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2002-12-02  Christian Neumair  <chris@gnome-de.org>
+
+	* schemas/*.schemas: Removed
+	* schemas/*.schemas.in: Added
+	* schemas/Makefile.am: Various fixes (#89361).
+
 2002-11-26  Fatih Demir <kabalak@gtranslator.org>
 
 	* configure.in: Added Tamil ("ta") to ALL_LINGUAS.
diff --git a/schemas/Makefile.am b/schemas/Makefile.am
index fedae2498..746410afa 100644
--- a/schemas/Makefile.am
+++ b/schemas/Makefile.am
@@ -1,12 +1,19 @@
-schemadir   = @GCONF_SCHEMA_FILE_DIR@
-schema_DATA = \
-	apps_gnome_settings_daemon_screensaver.schemas		\
-	apps_gnome_settings_daemon_default_editor.schemas	\
+schemadir   = $(GCONF_SCHEMA_FILE_DIR)
+schema_in_files= \
+	apps_gnome_settings_daemon_screensaver.schemas.in	\
+	apps_gnome_settings_daemon_default_editor.schemas.in	\
 	desktop_gnome_font_rendering.schemas
 
-schema_source_data = $(foreach file, $(schema_DATA), $(srcdir)/$(file))
+schema_DATA = $(schema_in_files:.schemas.in=.schemas)
 
-install-data-local: $(schema_installed_data)
-	GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE) $(GCONFTOOL) --makefile-install-rule $(schema_source_data)
+@INTLTOOL_SCHEMAS_RULE@
+
+# don't do this if we are building in eg. rpm
+install-data-local:
+	if test -z "$(DESTDIR)" ; then \
+		for p in $(schema_DATA) ; do \
+			GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE) $(GCONFTOOL) --makefile-install-rule $(srcdir)/$$p; \
+		done \
+	fi
 
 EXTRA_DIST=$(schema_DATA)
diff --git a/schemas/apps_gnome_settings_daemon_default_editor.schemas b/schemas/apps_gnome_settings_daemon_default_editor.schemas.in
similarity index 100%
rename from schemas/apps_gnome_settings_daemon_default_editor.schemas
rename to schemas/apps_gnome_settings_daemon_default_editor.schemas.in
diff --git a/schemas/apps_gnome_settings_daemon_screensaver.schemas b/schemas/apps_gnome_settings_daemon_screensaver.schemas.in
similarity index 100%
rename from schemas/apps_gnome_settings_daemon_screensaver.schemas
rename to schemas/apps_gnome_settings_daemon_screensaver.schemas.in
diff --git a/schemas/desktop_gnome_font_rendering.schemas b/schemas/desktop_gnome_font_rendering.schemas.in
similarity index 100%
rename from schemas/desktop_gnome_font_rendering.schemas
rename to schemas/desktop_gnome_font_rendering.schemas.in