diff --git a/docs/CHANGES.txt b/docs/CHANGES.txt
index b1a8451ad..9fcb778c9 100644
--- a/docs/CHANGES.txt
+++ b/docs/CHANGES.txt
@@ -8,7 +8,7 @@ http://www.tuxpaint.org/
 
 $Id$
 
-2008.September.22 (0.9.21)
+2008.October.4 (0.9.21)
   * New Starters:
     -------------
     * Silver Frame
@@ -41,7 +41,6 @@ $Id$
       + TV - Adds television (CRT) interlacing lines over the image.
       + Rosette - Paints at 3 points on the screen, in a rosette shape.
       + Picasso - Paints at 3 points, in a "Picasso" art style.
-      + Puzzle - Scramble the picture, like a sliding puzzle.
       + Wavelets - Waves that go up and down.
       By Adam 'foo-script' Rakowski <foo-script@o2.pl>
       (Part of Tux4Kids' participation in Google Summer of Code 2008)
diff --git a/magic/src/puzzle.c b/magic/src/puzzle.c
index 3291eb463..2d07d2006 100755
--- a/magic/src/puzzle.c
+++ b/magic/src/puzzle.c
@@ -26,6 +26,7 @@
   (See COPYING.txt)
 */
 
+/*
 #include <time.h>	//for time()
 #include "tp_magic_api.h"
 #include "SDL_image.h"
@@ -140,7 +141,11 @@ static void puzzle_draw(void * ptr, int which_tool,
   SDL_Rect rect_this, rect_that;
 
   SDL_BlitSurface(canvas, NULL, snapshot, NULL);
-  if (!api->touched(x,y))
+
+  x = (x / puzzle_gcd) * puzzle_gcd;
+  y = (y / puzzle_gcd) * puzzle_gcd;
+
+  if (!api->touched(x, y))
   {
 	  srand(rand());
 		
@@ -205,3 +210,4 @@ void puzzle_click(magic_api * api, int which, int mode,
 {
 	puzzle_drag(api, which, canvas, last, x, y, x, y, update_rect);
 }
+*/