diff --git a/roles/home-gui/files/xsession b/roles/home-gui/files/xsession-freebsd
similarity index 100%
rename from roles/home-gui/files/xsession
rename to roles/home-gui/files/xsession-freebsd
diff --git a/roles/home-gui/files/xsession-netbsd b/roles/home-gui/files/xsession-netbsd
new file mode 100644
index 0000000..5c2f200
--- /dev/null
+++ b/roles/home-gui/files/xsession-netbsd
@@ -0,0 +1,3 @@
+PATH=/usr/bin:/bin:/usr/X11R7/bin:/usr/pkg/bin
+xrdb -merge ~/.Xresources
+exec mwm
diff --git a/roles/home-gui/tasks/dotfiles.yml b/roles/home-gui/tasks/dotfiles.yml
index 7117eb9..edfdc36 100644
--- a/roles/home-gui/tasks/dotfiles.yml
+++ b/roles/home-gui/tasks/dotfiles.yml
@@ -27,3 +27,18 @@
   copy:
     src: xclock.desktop
     dest: "{{ ansible_env.HOME }}/.config/autostart/xclock.desktop"
+- name: Create FreeBSD xsession file
+  copy:
+    src: xsession-freebsd
+    dest: "{{ ansible_env.HOME }}/.xsession"
+  when: ansible_system == "FreeBSD"
+- name: Create NetBSD xsession file
+  copy:
+    src: xsession-netbsd
+    dest: "{{ ansible_env.HOME }}/.xsession"
+  when: ansible_system == "NetBSD"
+- name: Create xinitrc symlink
+  file:
+    src: ".xsession"
+    dest: "{{ ansible_env.HOME }}/.xinitrc"
+    state: link
diff --git a/roles/home-gui/tasks/mate.yml b/roles/home-gui/tasks/mate.yml
index dc2467e..af9ae51 100644
--- a/roles/home-gui/tasks/mate.yml
+++ b/roles/home-gui/tasks/mate.yml
@@ -32,8 +32,3 @@
     key: /org/mate/panel/objects/clock/prefs/expand-locations
     value: 'true'
   when: ansible_system == 'Linux'
-- name: Create xsession file
-  copy:
-    src: xsession
-    dest: "{{ ansible_env.HOME }}/.xsession"
-  when: ansible_system == "FreeBSD"