diff --git a/desktop/unx/source/makefile.mk b/desktop/unx/source/makefile.mk
index 5c5c8f3e9e88..92bfe4703b85 100755
--- a/desktop/unx/source/makefile.mk
+++ b/desktop/unx/source/makefile.mk
@@ -34,10 +34,10 @@ NO_DEFAULT_STL=TRUE
 
 .IF "$(ENABLE_QUICKSTART_LIBPNG)"=="TRUE"
 CFLAGS+=-DENABLE_QUICKSTART_LIBPNG
+CFLAGS+=$(LIBPNG_CFLAGS)
 .ENDIF
 
 STDLIB=
-CFLAGS+=$(LIBPNG_CFLAGS)
 
 OBJFILES= \
     $(OBJ)$/splashx.obj \
@@ -55,7 +55,10 @@ APP1RPATH  = BRAND
 APP1OBJS   = $(OBJFILES) $(PAGEIN_OBJS)
 APP1LIBSALCPPRT=
 APP1CODETYPE = C
-APP1STDLIBS = $(PTHREAD_LIBS) $(X11LINK_DYNAMIC) $(SALLIB) $(LIBPNG_LIBS)
+APP1STDLIBS = $(PTHREAD_LIBS) $(X11LINK_DYNAMIC) $(SALLIB)
+.IF "$(ENABLE_QUICKSTART_LIBPNG)"=="TRUE"
+APP1STDLIBS += $(LIBPNG_LIBS)
+.ENDIF
 .IF "$(OS)"=="SOLARIS"
 APP1STDLIBS+= -lsocket
 .ENDIF