diff --git a/src/gui_mac.c b/src/gui_mac.c
index 50e9669..52a24d7 100644
--- a/src/gui_mac.c
+++ b/src/gui_mac.c
@@ -4291,13 +4291,41 @@
     RGBBackColor(&TheColor);
 }
 
+RGBColor specialColor;
+
 /*
- * Set the current text speail color. TODO
+ * Set the current text special color.
  */
     void
 gui_mch_set_sp_color(color)
     guicolor_T	color;
 {
+    specialColor.red = Red(color) * 0x0101;
+    specialColor.green = Green(color) * 0x0101;
+    specialColor.blue = Blue(color) * 0x0101;
+}
+
+/*
+ * Draw undercurl at the bottom of the character cell.
+ */
+    static void
+draw_undercurl(int flags, int row, int col, int cells)
+{
+    int                 i;
+    int                 offset;
+    const static int    val[8] = {1, 0, 0, 0, 1, 2, 2, 2 };
+    int                 y = FILL_Y(row + 1) - 1;
+
+    RGBForeColor(&specialColor);
+
+    offset = val[FILL_X(col) % 8];
+    MoveTo(FILL_X(col), y - offset);
+
+    for (i = FILL_X(col); i < FILL_X(col + cells); ++i)
+    {
+	offset = val[i % 8];
+	LineTo(i, y - offset);
+    }
 }
 
     void
@@ -4451,6 +4479,9 @@
 #endif
     }
 
+    if (flags & DRAW_UNDERC)
+	draw_undercurl(flags, row, col, len);
+
 #ifdef FEAT_MBYTE
     vim_free(tofree);
 #endif
diff --git a/src/version.h b/src/version.h
index 274c3b1..dc62dd9 100644
--- a/src/version.h
+++ b/src/version.h
@@ -36,5 +36,5 @@
 #define VIM_VERSION_NODOT	"vim70aa"
 #define VIM_VERSION_SHORT	"7.0aa"
 #define VIM_VERSION_MEDIUM	"7.0aa ALPHA"
-#define VIM_VERSION_LONG	"VIM - Vi IMproved 7.0aa ALPHA (2005 Nov 25)"
-#define VIM_VERSION_LONG_DATE	"VIM - Vi IMproved 7.0aa ALPHA (2005 Nov 25, compiled "
+#define VIM_VERSION_LONG	"VIM - Vi IMproved 7.0aa ALPHA (2005 Nov 26)"
+#define VIM_VERSION_LONG_DATE	"VIM - Vi IMproved 7.0aa ALPHA (2005 Nov 26, compiled "