diff --git a/roles/home/tasks/emacs.yml b/roles/home/tasks/emacs.yml
index 5d4cfd3..18919a4 100644
--- a/roles/home/tasks/emacs.yml
+++ b/roles/home/tasks/emacs.yml
@@ -11,13 +11,19 @@
     depth: 3
   register: emacs_service_files
   when: ansible_system == 'Linux'
-- name: Create Emacs user service
+- name: Create Emacs user service (Linux)
   copy:
     src: '{{ item.path }}'
     dest: "{{ ansible_env.HOME }}/.config/systemd/user/emacs.service"
     remote_src: yes
   loop: '{{ emacs_service_files.files }}'
   when: ansible_system == 'Linux'
+- name: Add Emacs server to autostart (FreeBSD)
+  copy:
+    src: '{{ ansible_env.HOME }}/.emacs.d/emacs-server.desktop'
+    dest: '{{ ansible_env.HOME }}/.config/autostart'
+    remote_src: yes
+  when: ansible_system == 'FreeBSD'
 - name: Start Emacs user service
   systemd:
     name: emacs.service