diff --git a/ChangeLog b/ChangeLog
index 52d202ee..6f85a3e3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -198,6 +198,9 @@ CVS code -
   break_line()
 	- Only include the newline parameter if DISABLE_HELP isn't
 	  defined, as it's only used then. (DLR)
+	- In the surrounding #ifdef, replace the combination of
+	  !DISABLE_JUSTIFY and !DISABLE_WRAPPING with
+	  !DISABLE_WRAPJUSTIFY, for consistency. (DLR)
   begpar()
 	- Return FALSE if foo is NULL, as inpar() does. (DLR)
   backup_lines()
diff --git a/src/proto.h b/src/proto.h
index 42114542..a1ec2692 100644
--- a/src/proto.h
+++ b/src/proto.h
@@ -563,7 +563,7 @@ bool execute_command(const char *command);
 void wrap_reset(void);
 bool do_wrap(filestruct *line);
 #endif
-#if !defined(DISABLE_HELP) || !defined(DISABLE_JUSTIFY) || !defined(DISABLE_WRAPPING)
+#if !defined(DISABLE_HELP) || !defined(DISABLE_WRAPJUSTIFY)
 ssize_t break_line(const char *line, ssize_t goal
 #ifndef DISABLE_HELP
 	, bool newline
diff --git a/src/text.c b/src/text.c
index bac9a683..33effee8 100644
--- a/src/text.c
+++ b/src/text.c
@@ -583,7 +583,7 @@ bool do_wrap(filestruct *line)
 }
 #endif /* !DISABLE_WRAPPING */
 
-#if !defined(DISABLE_HELP) || !defined(DISABLE_JUSTIFY) || !defined(DISABLE_WRAPPING)
+#if !defined(DISABLE_HELP) || !defined(DISABLE_WRAPJUSTIFY)
 /* We are trying to break a chunk off line.  We find the last blank such
  * that the display length to there is at most (goal + 1).  If there is
  * no such blank, then we find the first blank.  We then take the last
@@ -676,7 +676,7 @@ ssize_t break_line(const char *line, ssize_t goal
 
     return blank_loc;
 }
-#endif /* !DISABLE_HELP || !DISABLE_JUSTIFY || !DISABLE_WRAPPING */
+#endif /* !DISABLE_HELP || !DISABLE_WRAPJUSTIFY */
 
 #if !defined(NANO_TINY) || !defined(DISABLE_JUSTIFY)
 /* The "indentation" of a line is the whitespace between the quote part