diff --git a/emacs b/emacs
index 34821bf..97f83e5 100644
--- a/emacs
+++ b/emacs
@@ -36,7 +36,7 @@
 
 ;; Platform specifics
 (if (eq system-type 'gnu/linux)         ; if we're running linux
-    (set-frame-font "tamsyn8x15r"))
+    (set-frame-font "-*-tamsyn-medium-*-*-*-15-*-*-*-*-80-*-*"))
 
 ;; Variables
 (setq
@@ -101,7 +101,7 @@
                (car frame)
              (selected-frame))))
     (progn
-      (set-frame-font "tamsyn8x15r"))))
+      (set-frame-font "-*-tamsyn-medium-*-*-*-15-*-*-*-*-80-*-*"))))
 (require 'server)
 (defadvice server-create-window-system-frame
   (after set-system-frame-colours ())