diff --git a/src/ChangeLog b/src/ChangeLog
index 83d43479df8..bd37f3528fd 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
+2008-12-20  Jason Rumney  <jasonr@gnu.org>
+
+	* frame.c (Fmake_terminal_frame): Raise an error when called from
+	a graphical frame on Windows.
+
 2008-12-20  Jan Djärv  <jan.h.d@swipnet.se>
 
 	* frame.c (Fdelete_frame): Set f->menu_bar_vector to Qnil.
diff --git a/src/frame.c b/src/frame.c
index 8af3e4bf35f..db8874f5280 100644
--- a/src/frame.c
+++ b/src/frame.c
@@ -684,7 +684,7 @@ affects all frames on the same terminal device.  */)
     abort ();
 #else /* not MSDOS */
 
-#if 0                           /* This should work now! */
+#ifdef WINDOWSNT                           /* This should work now! */
   if (sf->output_method != output_termcap)
     error ("Not using an ASCII terminal now; cannot make a new ASCII frame");
 #endif