diff --git a/panda/src/configfiles/panda.emacs b/panda/src/configfiles/panda.emacs
index 63b7e65d40..aa25470588 100644
--- a/panda/src/configfiles/panda.emacs
+++ b/panda/src/configfiles/panda.emacs
@@ -28,6 +28,8 @@
 ; buffer whenever you switch to C++ mode.
 (setq c++-mode-hook (lambda ()
 		      (setq indent-tabs-mode nil)
+                      ;; Make sure we use unix encoding
+                      (setq local-write-file-hooks 'Use-Undecided-Unix-Mode)
 		      ))
 
 ;;