diff --git a/docs/CHANGES.txt b/docs/CHANGES.txt
index c1eed2b8f..0148b27a2 100644
--- a/docs/CHANGES.txt
+++ b/docs/CHANGES.txt
@@ -21,6 +21,8 @@ http://www.newbreedsoftware.com/tuxpaint/
   * Added some more brushes.
     Jeremie Zimmermann <txptdv@tofz.org>
 
+  * Now prompts to confirm before printing.
+
   * Updated/corrected Tamil translation
     Mugunth <mugunth@thamizha.com>
 
diff --git a/src/tuxpaint.c b/src/tuxpaint.c
index 669a54198..7c8243a32 100644
--- a/src/tuxpaint.c
+++ b/src/tuxpaint.c
@@ -814,6 +814,10 @@ int main(int argc, char * argv[])
 #define PROMPT_OPEN_NOFILES_TXT gettext_noop("There are no saved files!")
 #define PROMPT_OPEN_NOFILES_YES gettext_noop("Okay")
 
+#define PROMPT_PRINT_NOW_TXT gettext_noop("Print your picture now?")
+#define PROMPT_PRINT_NOW_YES gettext_noop("Yes")
+#define PROMPT_PRINT_NOW_NO gettext_noop("No")
+
 #define PROMPT_PRINT_TXT gettext_noop("Your picture has been printed!")
 #define PROMPT_PRINT_YES gettext_noop("Okay")
 
@@ -1408,9 +1412,14 @@ void mainloop(void)
 			  
 			  if (cur_time >= last_print_time + print_delay)
 			    {
-			      do_print();
+		              if (do_prompt(PROMPT_PRINT_NOW_TXT,
+				            PROMPT_PRINT_NOW_YES,
+				            PROMPT_PRINT_NOW_NO))
+			      {
+			        do_print();
 			      
-			      last_print_time = cur_time;
+			        last_print_time = cur_time;
+			      }
 			    }
 			  else
 			    {