diff --git a/ChangeLog b/ChangeLog
index 94412d5f0..fc9f9a021 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -6,6 +6,9 @@
  - (bal) Resynced CVS ID with OpenBSD for channel.c and uidswap.c
  - (bal) if no MAXHOSTNAMELEN is defined.  Default to 64 character defination.
    Suggested by Christian Kurz <shorty@debain.org>
+ - (bal) Add in '.c.o' section to Makefile.in to address make programs that
+    don't honor CPPFLAGS by default.  Suggested by Lutz Jaenicke 
+    <Lutz.Jaenicke@aet.TU-Cottbus.DE>
 
 20001229
  - (bal) Fixed spelling of 'authorized_keys' in ssh-copy-id.1 by Christian 
diff --git a/Makefile.in b/Makefile.in
index 05ff36eff..e05ddd1f3 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -74,6 +74,9 @@ $(SSHOBJS): config.h
 $(SSHDOBJS): config.h
 $(LIBOPENBSD_COMPAT_OBJS): config.h
 
+.c.o:
+	$(CC) $(CFLAGS) $(CPPFLAGS) -o $<
+
 libopenbsd-compat.a: $(LIBOPENBSD_COMPAT_OBJS)
 	$(AR) rv $@ $(LIBOPENBSD_COMPAT_OBJS)
 	$(RANLIB) $@