diff --git a/Source/OpenTK/Fonts/DisplayListTextHandle.cs b/Source/OpenTK/Fonts/DisplayListTextHandle.cs
new file mode 100644
index 00000000..9a36973f
--- /dev/null
+++ b/Source/OpenTK/Fonts/DisplayListTextHandle.cs
@@ -0,0 +1,35 @@
+#region --- License ---
+/* Copyright (c) 2006, 2007 Stefanos Apostolopoulos
+ * See license.txt for license info
+ */
+#endregion
+
+using System;
+using System.Collections.Generic;
+using System.Text;
+using OpenTK.OpenGL;
+
+namespace OpenTK.Fonts
+{
+    class DisplayListTextHandle : TextHandle
+    {
+        public DisplayListTextHandle(int handle) : base(handle) { }
+
+        public override string ToString()
+        {
+            return String.Format("TextHandle (display list): {0}", Handle);
+        }
+
+        protected override void Dispose(bool manual)
+        {
+            if (!disposed)
+            {
+                if (manual)
+                {
+                    GL.DeleteLists(Handle, 1);
+                }
+                disposed = true;
+            }
+        }
+    }
+}
diff --git a/Source/OpenTK/Fonts/DisplayListTextPrinter.cs b/Source/OpenTK/Fonts/DisplayListTextPrinter.cs
index 6e83b5bd..a34ec991 100644
--- a/Source/OpenTK/Fonts/DisplayListTextPrinter.cs
+++ b/Source/OpenTK/Fonts/DisplayListTextPrinter.cs
@@ -45,9 +45,4 @@ namespace OpenTK.Fonts
 
         #endregion
     }
-
-    public class DisplayListTextHandle : TextHandle
-    {
-        public DisplayListTextHandle(int handle) : base(handle) { }
-    }
 }