diff --git a/etc/ChangeLog b/etc/ChangeLog
index c9d48500245..85617a80418 100644
--- a/etc/ChangeLog
+++ b/etc/ChangeLog
@@ -1,3 +1,10 @@
+2004-03-29  Vinicius Jose Latorre  <viniciusjl@ig.com.br>
+
+	* ps-prin1.ps: Clip the header and footer area, so text will not be
+	printed outside header or footer, respectively.
+	(HeaderClip, FooterClip): New PostScript funs.
+	(HeaderText, FooterText): Adjust PostScript code.
+
 2004-03-29  Jan Dj,Ad(Brv  <jan.h.d@swipnet.se>
 
 	* TODO: Removed drag-and-drop entry (DONE).
diff --git a/etc/ps-prin1.ps b/etc/ps-prin1.ps
index 1716562b0f4..70adabc7b0c 100644
--- a/etc/ps-prin1.ps
+++ b/etc/ps-prin1.ps
@@ -751,6 +751,9 @@ StandardEncoding 46 82 getinterval aload pop
   FooterLineHeight FooterLines 1 sub mul add
 }def
 
+/HeaderClip{HeaderFrameStart moveto HeaderFramePath clip}def
+/FooterClip{FooterFrameStart moveto FooterFramePath clip}def
+
 /strcat{
   dup length 3 -1 roll dup length dup 4 -1 roll add string dup
   0 5 -1 roll putinterval
@@ -803,17 +806,21 @@ StandardEncoding 46 82 getinterval aload pop
 }def
 
 /HeaderText{
+  gsave HeaderClip
   HeaderLinesRight HeaderLinesLeft
   /HeaderStart HeaderLineHeight HeaderPad
   HeaderFrameProperties 0 get
   HeaderOrFooterText
+  grestore
 }def
 
 /FooterText{
+  gsave FooterClip
   FooterLinesRight FooterLinesLeft
   /FooterStart FooterLineHeight FooterPad
   FooterFrameProperties 0 get
   HeaderOrFooterText
+  grestore
 }def
 
 /ReportFontInfo{