--- a/data/caribou-autostart.desktop.in.in
+++ b/data/caribou-autostart.desktop.in.in
@@ -2,7 +2,7 @@
 Type=Application
 Name=Caribou
 Exec=@libexecdir@/caribou
-AutostartCondition=GSettings org.gnome.desktop.a11y.applications screen-keyboard-enabled
+AutostartCondition=GSettings org.cinnamon.desktop.a11y.applications screen-keyboard-enabled
 X-GNOME-AutoRestart=true
 #X-GNOME-Autostart-Phase=Initialization
-OnlyShowIn=GNOME;Unity;
+OnlyShowIn=X-Cinnamon;

--- a/modules/caribou-gtk-module.desktop
+++ b/modules/caribou-gtk-module.desktop
@@ -2,5 +2,5 @@
 Name=Caribou
 Description=Caribou On-Screen Keyboard GTK+ Module
 X-GTK-Module-Name=caribou-gtk-module
-X-GTK-Module-Enabled-Schema=org.gnome.desktop.a11y.applications
+X-GTK-Module-Enabled-Schema=org.cinnamon.desktop.a11y.applications
 X-GTK-Module-Enabled-Key=screen-keyboard-enabled