diff --git a/ld/ChangeLog b/ld/ChangeLog
index f1a55063d62..bda269c5a84 100644
--- a/ld/ChangeLog
+++ b/ld/ChangeLog
@@ -1,3 +1,8 @@
+2018-09-14  Maciej W. Rozycki  <macro@linux-mips.org>
+
+	* ldexp.c (fold_binary): Check that `config.maxpagesize' is
+	non-zero before using it as a divisor.
+
 2018-09-03  Nick Clifton  <nickc@redhat.com>
 
 	* po/fi.po: Updated Finnish translation.
diff --git a/ld/ldexp.c b/ld/ldexp.c
index e123f0e35fe..4b9676ecbab 100644
--- a/ld/ldexp.c
+++ b/ld/ldexp.c
@@ -545,6 +545,7 @@ fold_binary (etree_type *tree)
 	  {
 	    if (!seg->used
 		&& config.magic_demand_paged
+		&& config.maxpagesize != 0
 		&& (seg->value % config.maxpagesize) != 0)
 	      einfo (_("%P: warning: address of `%s' "
 		       "isn't multiple of maximum page size\n"),