diff --git a/ANNOUNCE b/ANNOUNCE
index e525f2651..c7d48fa20 100644
--- a/ANNOUNCE
+++ b/ANNOUNCE
@@ -26,6 +26,8 @@ Other information:
 Changes since the last public release (1.6.29):
 
 Version 1.6.30beta01 [March 16, 2017]
+  Added missing "$(CPPFLAGS)" to the compile line for c.pic.o in
+    makefile.linux and makefile.solaris-x86 (Cosmin).
 
 Send comments/corrections/commendations to png-mng-implement at lists.sf.net
 (subscription required; visit
diff --git a/CHANGES b/CHANGES
index b3acee64c..ef671cc64 100644
--- a/CHANGES
+++ b/CHANGES
@@ -5818,6 +5818,8 @@ Version 1.6.29 [March 16, 2017]
   No changes.
 
 Version 1.6.30beta01 [March 16, 2017]
+  Added missing "$(CPPFLAGS)" to the compile line for c.pic.o in
+    makefile.linux and makefile.solaris-x86 (Cosmin).
 
 Send comments/corrections/commendations to png-mng-implement at lists.sf.net
 (subscription required; visit
diff --git a/scripts/makefile.linux b/scripts/makefile.linux
index d8fbec980..f3f9550b8 100644
--- a/scripts/makefile.linux
+++ b/scripts/makefile.linux
@@ -92,7 +92,7 @@ OBJSDLL = $(OBJS:.o=.pic.o)
 	$(CC) -c $(CPPFLAGS) $(CFLAGS) -o $@ $<
 
 .c.pic.o:
-	$(CC) -c $(CFLAGS) -fPIC -o $@ $*.c
+	$(CC) -c $(CPPFLAGS) $(CFLAGS) -fPIC -o $@ $*.c
 
 all: libpng.a $(LIBSO) pngtest pngtest-static libpng.pc libpng-config
 
diff --git a/scripts/makefile.solaris-x86 b/scripts/makefile.solaris-x86
index b6d24375d..2ee3c14a5 100644
--- a/scripts/makefile.solaris-x86
+++ b/scripts/makefile.solaris-x86
@@ -83,7 +83,7 @@ OBJSDLL = $(OBJS:.o=.pic.o)
 	$(CC) -c $(CPPFLAGS) $(CFLAGS) -o $@ $<
 
 .c.pic.o:
-	$(CC) -c $(CFLAGS) -fPIC -o $@ $*.c
+	$(CC) -c $(CPPFLAGS) $(CFLAGS) -fPIC -o $@ $*.c
 
 all: libpng.a $(LIBSO) pngtest libpng.pc libpng-config