diff --git a/hw/xfree86/common/extramodes b/hw/xfree86/common/extramodes
index 4505026..86b3d51 100644
--- a/hw/xfree86/common/extramodes
+++ b/hw/xfree86/common/extramodes
@@ -25,3 +25,42 @@ Modeline "2048x1536" 340.48  2048 2216 2440 2832  1536 1537 1540 1603 -hsync +vs
 # 2048x1536 @ 85Hz (VESA GTF) hsync: 137.0kHz
 Modeline "2048x1536" 388.04  2048 2216 2440 2832  1536 1537 1540 1612 -hsync +vsync
 
+//-------------------------------------------------------------------------
+// Copyright (c) 2004, Oracle and/or its affiliates. All rights reserved.
+//
+// Permission is hereby granted, free of charge, to any person obtaining a
+// copy of this software and associated documentation files (the "Software"),
+// to deal in the Software without restriction, including without limitation
+// the rights to use, copy, modify, merge, publish, distribute, sublicense,
+// and/or sell copies of the Software, and to permit persons to whom the
+// Software is furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice (including the next
+// paragraph) shall be included in all copies or substantial portions of the
+// Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+// THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+// DEALINGS IN THE SOFTWARE.
+//
+//-------------------------------------------------------------------------
+//
+// Additional timing specs for Sun monitors
+
+// Skip this one for now as it breaks some other common 1600x1200@75Hz displays
+// # 1600x1200 @ 60Hz (Sun) hsync: 74.493kHz
+// Modeline "1600x1200" 132.3 1600 1608 1672 1776 1200 1205 1215 1239 +hsync +vsync
+
+# 1920x1080 @ 60Hz (Sun) hsync: 66.975kHz
+Modeline "1920x1080" 137.7 1920 1928 1992 2056 1080 1082 1086 1112 +hsync +vsync
+
+# 1920x1200 @ 60Hz (Sun 24.1" LCD) hsync: 73.54 kHz
+ModeLine "1920x1200" 151.200 1920 1928 1992 2056 1200 1202 1206 1234 +HSync +VSync
+
+# 1920x1200 @ 70.316Hz (Sun 24" CRT) hsync: 87.192 kHz
+ModeLine "1920x1200" 219.375 1920 1944 2172 2516 1200 1201 1204 1240 -HSync -VSync
+