diff --git a/data/Makefile.am b/data/Makefile.am
index 52c21f87..6e938228 100644
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -3,7 +3,20 @@ SUBDIRS = icons themes keyboards
 desktopdir = $(datadir)/applications
 desktop_in_files = eekboard.desktop.in
 desktop_DATA = $(desktop_in_files:.desktop.in=.desktop)
+
+if ENABLE_ATSPI
+autostartdir	 = $(sysconfdir)/xdg/autostart
+autostart_in_files = eekboard-autostart.desktop.in
+autostart_DATA   = $(autostart_in_files:.desktop.in=.desktop)
+endif
+
 @INTLTOOL_DESKTOP_RULE@
 
 CLEANFILES = $(desktop_DATA)
 EXTRA_DIST = $(desktop_in_files)
+
+if ENABLE_ATSPI
+CLEANFILES += $(autostart_DATA)
+EXTRA_DIST += $(autostart_in_files)
+endif
+
diff --git a/data/eekboard-autostart.desktop.in b/data/eekboard-autostart.desktop.in
new file mode 100644
index 00000000..11e937ea
--- /dev/null
+++ b/data/eekboard-autostart.desktop.in
@@ -0,0 +1,6 @@
+[Desktop Entry]
+Name=Eekboard
+Exec=eekboard -f
+Type=Application
+AutostartCondition=GSettings org.gnome.desktop.a11y.applications screen-keyboard-enabled
+X-GNOME-AutoRestart=true