diff --git a/Makefile b/Makefile
index f5ac4092c..62ac6a92e 100755
--- a/Makefile
+++ b/Makefile
@@ -268,7 +268,8 @@ CONFIGURED_DESKTOP_ENTRY := $(basename $(UNCONFIGURED_DESKTOP_ENTRY))
 CONFIGURED_DBUS_SERVICE := $(basename $(UNCONFIGURED_DBUS_SERVICE))
 
 SYS_INSTALLED_EXTENSION_DIR := $(extensiondir)/$(EXTENSION_UUID)
-SYS_INSTALLED_CONTENT := $(addprefix $(SYS_INSTALLED_EXTENSION_DIR)/,$(PACK_CONTENT) $(SCHEMAS_COMPILED))
+SYS_INSTALLED_CONTENT := $(addprefix $(SYS_INSTALLED_EXTENSION_DIR)/,$(filter-out $(SCHEMAS) $(SCHEMAS_COMPILED),$(PACK_CONTENT)))
+SYS_INSTALLED_SCHEMAS := $(addprefix $(datadir)/glib-2.0/schemas/,$(notdir $(SCHEMAS)))
 SYS_INSTALLED_DESKTOP_ENTRY := $(datadir)/applications/$(notdir $(CONFIGURED_DESKTOP_ENTRY))
 SYS_INSTALLED_DBUS_SERVICE := $(datadir)/dbus-1/services/$(notdir $(CONFIGURED_DBUS_SERVICE))
 SYS_INSTALLED_EXECUTABLES := $(addprefix $(SYS_INSTALLED_EXTENSION_DIR)/,$(EXECUTABLES))
@@ -276,6 +277,7 @@ SYS_INSTALLED_LAUNCHER := $(filter %$(LAUNCHER),$(SYS_INSTALLED_EXECUTABLES))
 SYS_INSTALLED_LAUNCHER_SYMLINK := $(bindir)/$(notdir $(LAUNCHER))
 SYS_INSTALLED_ALL := \
 	$(SYS_INSTALLED_CONTENT) \
+	$(SYS_INSTALLED_SCHEMAS) \
 	$(SYS_INSTALLED_DESKTOP_ENTRY) \
 	$(SYS_INSTALLED_DBUS_SERVICE) \
 	$(SYS_INSTALLED_LAUNCHER_SYMLINK) \
@@ -321,6 +323,11 @@ $(addprefix $(DESTDIR),$(SYS_INSTALLED_DBUS_SERVICE)): $(CONFIGURED_DBUS_SERVICE
 $(addprefix $(DESTDIR),$(SYS_INSTALLED_LAUNCHER_SYMLINK)): | installdirs
 	ln -s $(SYS_INSTALLED_LAUNCHER) $@
 
+system-schemas-compile: $(addprefix $(DESTDIR),$(SYS_INSTALLED_SCHEMAS)) $(GLIB_COMPILE_SCHEMAS)
+	$(GLIB_COMPILE_SCHEMAS) $(dir $<)
+
+.PHONY: system-schemas-compile
+
 system-install: $(addprefix $(DESTDIR),$(SYS_INSTALLED_ALL))
 
 system-uninstall:
@@ -329,6 +336,11 @@ system-uninstall:
 
 .PHONY: system-install system-uninstall installdirs
 
+ifeq ($(DESTDIR),)
+system-install: system-schemas-compile
+system-uninstall: system-schemas-compile
+endif
+
 # System/user install autodetect
 
 ifneq ($(DESTDIR),)