diff --git a/ChangeLog b/ChangeLog
index 932adb1fd860a4681d2f396cf81690b179d997bb..7e4cd89c2a413a60473c3d4f99e5b47eb2a147c9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+git HEAD
+
+    * --max-dimension: ignore width/height limit of 0 pixels
+
 Thu, 15 May 2014 23:41:07 +0200  Daniel Friesel <derf+feh@finalrewind.org>
 
 * Releasev v2.12
diff --git a/man/feh.pre b/man/feh.pre
index e95ece5c3e8ceec3a0df5efb1a765896ca20cc40..787cdb9bc1812ee2ad9582a150356af64405eff9 100644
--- a/man/feh.pre
+++ b/man/feh.pre
@@ -420,8 +420,8 @@ Only show images with width <=
 .Ar width
 and height <=
 .Ar height .
-If you only care about one parameter, set the other to either something large
-or -1.
+If you only care about one parameter, set the other to 0
+.Pq or a negative value .
 .
 .It Cm -M , --menu-font Ar font
 .
diff --git a/src/options.c b/src/options.c
index 8fbdbfb28b2101de044a63a1da6b635a28927c95..7e7adee683f039d6affddb7a5d36c6b52c49b23e 100644
--- a/src/options.c
+++ b/src/options.c
@@ -421,6 +421,10 @@ static void feh_parse_option_array(int argc, char **argv, int finalrun)
 			break;
 		case '<':
 			XParseGeometry(optarg, &discard, &discard, &opt.max_width, &opt.max_height);
+			if (opt.max_width == 0)
+				opt.max_width = UINT_MAX;
+			if (opt.max_height == 0)
+				opt.max_height = UINT_MAX;
 			break;
 		case '>':
 			XParseGeometry(optarg, &discard, &discard, &opt.min_width, &opt.min_height);