diff --git a/src/ChangeLog b/src/ChangeLog
index 412e67828a7..6fe7de51293 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,5 +1,9 @@
 2012-10-21  Jan Djärv  <jan.h.d@swipnet.se>
 
+	* nsfont.m (nsfont_open, ns_glyph_metrics): Force integer advancement
+	for screen font.
+	(nsfont_draw): Turn off LCD-smoothing (Bug#11484).
+
 	* xterm.c (x_focus_changed): Check if daemonp when sending focus in
 	event (Bug#12681).
 
diff --git a/src/nsfont.m b/src/nsfont.m
index 7c9f05aa0bb..4f29d1d54a9 100644
--- a/src/nsfont.m
+++ b/src/nsfont.m
@@ -797,7 +797,13 @@ when setting family in ns_spec_to_descriptor(). */
   block_input ();
 
   /* for metrics */
+#ifdef NS_IMPL_COCOA
+  sfont = [nsfont screenFontWithRenderingMode:
+                    NSFontAntialiasedIntegerAdvancementsRenderingMode];
+#else
   sfont = [nsfont screenFont];
+#endif
+
   if (sfont == nil)
     sfont = nsfont;
 
@@ -1229,6 +1235,7 @@ is false when (FROM > 0 || TO < S->nchars). */
     else
       CGContextSetShouldAntialias (gcontext, 1);
 
+    CGContextSetShouldSmoothFonts (gcontext, NO);
     CGContextSetTextMatrix (gcontext, fliptf);
 
     if (bgCol != nil)
@@ -1372,7 +1379,12 @@ is false when (FROM > 0 || TO < S->nchars). */
 #endif
 
   block_input ();
- sfont = [font_info->nsfont screenFont];
+#ifdef NS_IMPL_COCOA
+  sfont = [font_info->nsfont screenFontWithRenderingMode:
+                      NSFontAntialiasedIntegerAdvancementsRenderingMode];
+#else
+  sfont = [font_info->nsfont screenFont];
+#endif
 
   font_info->metrics[block] = xzalloc (0x100 * sizeof (struct font_metrics));
   if (!(font_info->metrics[block]))