diff --git a/docs/CHANGES.txt b/docs/CHANGES.txt
index 372a6560c..1ac63c22b 100644
--- a/docs/CHANGES.txt
+++ b/docs/CHANGES.txt
@@ -10,9 +10,8 @@ http://www.tuxpaint.org/
 2022.September.5 (0.9.29)
   * Improvements to "Stamp" tool:
     -----------------------------
-    * WIP - Stamps may now be rotated.
-      Use the "--stamp-rotation" option.  FIXME: Likely to
-      become default, with a "--no..." option.
+    * Stamps may now be rotated.
+      Use the "stamprotation=no" option to disable.
       Pere Pujal i Carabantes <perepujal@gmail.com>
 
   * Bug Fixes:
diff --git a/src/parse.gperf b/src/parse.gperf
index ab8147f0e..699d79814 100644
--- a/src/parse.gperf
+++ b/src/parse.gperf
@@ -154,7 +154,7 @@ stereo,              POSBOOL(use_stereo)
 stampcontrols,       NEGBOOL(disable_stamp_controls)
 stamps,              NEGBOOL(dont_load_stamps)
 stampsize,           MULTI(stamp_size_override)
-stamp-rotation,	     POSBOOL(stamp_rotation)
+stamprotation,       NEGBOOL(no_stamp_rotation)
 startblank,          POSBOOL(start_blank)
 startlast,           NEGBOOL(start_blank)
 sysconfig,           POSBOOL(parsertmp_sysconfig)
diff --git a/src/parse.h b/src/parse.h
index 6f501bc01..a5034befe 100644
--- a/src/parse.h
+++ b/src/parse.h
@@ -24,7 +24,7 @@ struct cfginfo
   const char *disable_stamp_controls;
   const char *dont_do_xor;
   const char *dont_load_stamps;
-  const char *stamp_rotation;
+  const char *no_stamp_rotation;
   const char *exportdir;
   const char *fullscreen;
   const char *grab_input;
diff --git a/src/tuxpaint.c b/src/tuxpaint.c
index b6b4fe750..1d639a355 100644
--- a/src/tuxpaint.c
+++ b/src/tuxpaint.c
@@ -1374,7 +1374,7 @@ static int dont_load_stamps;
 static int mirrorstamps;
 static int disable_stamp_controls;
 static int stamp_size_override = -1;
-static int stamp_rotation = 0;
+static int no_stamp_rotation = 0;
 static int new_colors_last;
 
 #ifdef NOKIA_770
@@ -5809,7 +5809,7 @@ static void mainloop(void)
 			{
 			  if (old_x >= 0 && old_y >= 0 && old_x <= r_canvas.w && old_y <= r_canvas.h)
 			    {
-			      if (stamp_rotation)
+			      if (!no_stamp_rotation)
 				{
                                   /* Going through stamp rotation step, first */
 
@@ -7504,7 +7504,7 @@ static void stamp_draw(int x, int y, int stamp_angle_rotation)
       dont_free_scaled_surf = 1;
     }
 
-  /* Rotate the stamp if stamp_rotation is configured */
+  /* Rotate the stamp (if no_stamp_rotation is not configured) */
   if (stamp_angle_rotation)
     tmp_surf = rotozoomSurface(tmp_surf, stamp_angle_rotation, 1.0, SMOOTHING_ON);
 
@@ -26660,7 +26660,7 @@ static void setup_config(char *argv[])
   SETBOOL(hide_cursor);
   SETBOOL(keymouse);
   SETBOOL(mirrorstamps);
-  SETBOOL(stamp_rotation);
+  SETBOOL(no_stamp_rotation);
   SETBOOL(native_screensize);
   SETBOOL(new_colors_last);
   SETBOOL(no_button_distinction);