diff --git a/ChangeLog b/ChangeLog
index a556ecdc7e6977e173eb6db0e3d4b193b2960513..6afae82388ebdc55cb376b66a9fb660d2794008a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2005-12-12  Albert Astals Cid  <aacid@kde.org>
+
+	* poppler/Page.cc: Ignore cropBox if it seems incorrect
+
 2005-12-12  Kristian Høgsberg  <krh@redhat.com>
 
 	* Makefile.am:
diff --git a/poppler/Page.cc b/poppler/Page.cc
index d467f2e833c72013cd02a4c14cfa736c7d7f1e13..926423f92bbd02a78bf8406a683758b47b78833e 100644
--- a/poppler/Page.cc
+++ b/poppler/Page.cc
@@ -67,6 +67,13 @@ PageAttrs::PageAttrs(PageAttrs *attrs, Dict *dict) {
   if (!haveCropBox) {
     cropBox = mediaBox;
   }
+  else
+  {
+    // cropBox can not be bigger than mediaBox
+    if (cropBox.x2 - cropBox.x1 > mediaBox.x2 - mediaBox.x1 ||
+        cropBox.y2 - cropBox.y1 > mediaBox.y2 - mediaBox.y1)
+            cropBox = mediaBox;
+  }
 
   // other boxes
   bleedBox = cropBox;