diff --git a/Makefile b/Makefile
index 50e420c..87caa76 100644
--- a/Makefile
+++ b/Makefile
@@ -68,23 +68,26 @@ endif
 endif
 
 # use 386 instructions but optimize for pentium II/III
-CFLAGS = -g -D$(TYPESIZE) -O3 -I. -O1 -idirafter$(BOOST_INCLUDE) -Wall -Wno-uninitialized $(CFLAGAPP)
+CFLAGS +=  -D$(TYPESIZE)  -I.  -idirafter$(BOOST_INCLUDE) -Wall -Wno-uninitialized 
+CXXFLAGS +=  -D$(TYPESIZE)  -I.  -idirafter$(BOOST_INCLUDE) -Wall -Wno-uninitialized 
 
 ifeq ($(DEBUG),1)
 CFLAGS += -DDEBUG
+CXXFLAGS += -DDEBUG
 endif
 
 ifeq ($(MACHINE),mingw32)
 CFLAGS += -DMINGW
+CXXFLAGS += -DMINGW
 endif
 
 ifeq ($(ISCYGWIN),1)
 ifeq ($(NOCYGWIN),1)
 CFLAGS += -DMINGW -mno-cygwin
+CXXFLAGS += -DMINGW -mno-cygwin
 endif
 endif
 
-CXXFLAGS = $(CFLAGS)
 
 
 # Somewhat automatic detection of the correct boost include folder
@@ -219,9 +222,7 @@ FORCE:
 	$(_E) [REBUILD] $(@:%_r=%)
 	$(_C)rm -f $(@:%_r=%)
 	$(_C)$(MAKE) ${_S} $(@:%_r=%)
-	$(_E) [STRIP/UPX] $(@:%_r=%)
 	$(_C)$(STRIP)  $(@:%_r=%)
-	$(_C)upx $(_Q) --best  $(@:%_r=%)
 
 release: $(GRFCODEC)_r $(GRFDIFF)_r $(GRFMERGE)_r
 
@@ -230,9 +231,7 @@ grfmrgc.bin:	grfmerge.os $(GRFMERGESRC:%.c=%.os)
 	$(_C)rm -f $@
 	$(_E) [LD] $@
 	$(_C)$(CC) -o $@ $(CFLAGS) -Os $^
-	$(_E) [STRIP/UPX] $@
 	$(_C)$(STRIP) $@
-	$(_C)upx $(_Q) --best $@
 
 grfmrg.c:	grfmrgc.bin grfmrgc.pl
 	$(_E) [PERL] $@
diff --git a/Makefile.common b/Makefile.common
index c559c0a..22e971d 100644
--- a/Makefile.common
+++ b/Makefile.common
@@ -5,9 +5,7 @@ FORCE:
 	$(_E) [REBUILD] $(@:%_r=%)
 	$(_C)rm -f $(@:%_r=%)$(EXE)
 	$(_C)make -f $(MAKEFILE) $(_S) $(@:%_r=%)
-	$(_E) [STRIP/UPX] $(@:%_r=%)
 	$(_C)strip  $(@:%_r=%)$(REL_EXE)
-	$(_C)upx $(_Q) --best  $(@:%_r=%)$(REL_EXE)
 
 release: grfcodec_r grfdiff_r grfmerge_r
 
@@ -16,9 +14,7 @@ grfmrgc.bin:	grfmerge.os $(GRFMERGESRC:%.c=%.os)
 	$(_C)rm -f $@
 	$(_E) [LD] $@
 	$(_C)$(CC) -o $@ $(CFLAGS) -Os $^
-	$(_E) [STRIP/UPX] $@
 	$(_C)strip $@
-	$(_C)upx $(_Q) --best $@
 
 grfmrg.c:	grfmrgc.bin grfmrgc.pl
 	$(_E) [PERL] $@