diff -u xtrs-4.9c/Makefile xtrs-4.9c/Makefile
--- xtrs-4.9c/Makefile
+++ xtrs-4.9c/Makefile
@@ -165,7 +165,7 @@
 		$(CC) $(LDFLAGS) -o xtrs $(OBJECTS) $(LIBS)
 
 compile_rom:	$(CR_OBJECTS)
-		$(CC) -o compile_rom $(CR_OBJECTS)
+		$(CC) $(LDFLAGS) -o compile_rom $(CR_OBJECTS)
 
 trs_rom1.c:	compile_rom $(BUILT_IN_ROM)
 		./compile_rom 1 $(BUILT_IN_ROM) > trs_rom1.c
@@ -177,13 +177,13 @@
 		./compile_rom 4p $(BUILT_IN_ROM4P) > trs_rom4p.c
 
 mkdisk:		$(MD_OBJECTS)
-		$(CC) -o mkdisk $(MD_OBJECTS)
+		$(CC) $(LDFLAGS) -o mkdisk $(MD_OBJECTS)
 
 hex2cmd:	$(HC_OBJECTS)
-		$(CC) -o hex2cmd $(HC_OBJECTS)
+		$(CC) $(LDFLAGS) -o hex2cmd $(HC_OBJECTS)
 
 cmddump:	$(CD_OBJECTS)
-		$(CC) -o cmddump $(CD_OBJECTS)
+		$(CC) $(LDFLAGS) -o cmddump $(CD_OBJECTS)
 
 saber_src:
 		#ignore SIGIO
diff -u xtrs-4.9c/debian/rules xtrs-4.9c/debian/rules
--- xtrs-4.9c/debian/rules
+++ xtrs-4.9c/debian/rules
@@ -14,16 +14,14 @@
 
 ARCH=$(shell dpkg-architecture -qDEB_HOST_ARCH_CPU)
 ENDIANNESS=$(shell dpkg-architecture -qDEB_HOST_ARCH_ENDIAN)
+CPPFLAGS=$(shell dpkg-buildflags --get CPPFLAGS)
+CFLAGS=$(shell dpkg-buildflags --get CFLAGS)
+LDFLAGS=$(shell dpkg-buildflags --get LDFLAGS)
 
 ifeq ($(ENDIANNESS),)
 $(error endianness of $(ARCH) architecture is unknown\; cannot continue)
 endif
 
-# if $DEB_BUILD_OPTIONS *doesn't* contain "noopt"
-ifeq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
-OPTIMIZE:=-O2
-endif
-
 PLAINTEXT_GOALS=cpmutil.txt dskspec.txt debian/trs80faq.txt
 
 %.txt: %.html
@@ -47,10 +45,11 @@
 	    touch "$$F"; \
 	done
 ifeq ($(ENDIANNESS),big)
-	$(MAKE) DEBUG="-Wall -Werror -Wno-error=unused-but-set-variable $(OPTIMIZE) -g -D_REENTRANT" PREFIX=/usr \
-	  ENDIAN=-Dbig_endian
+	$(MAKE) DEBUG="$(CFLAGS) $(CPPFLAGS) -Wall -Wno-error=unused-but-set-variable -D_REENTRANT" PREFIX=/usr \
+	  LDFLAGS="$(LDFLAGS)" ENDIAN=-Dbig_endian
 else
-	$(MAKE) DEBUG="-Wall -Werror -Wno-error=unused-but-set-variable $(OPTIMIZE) -g -D_REENTRANT" PREFIX=/usr
+	$(MAKE) DEBUG="$(CFLAGS) $(CPPFLAGS) $(LDFLAGS) -Wall -Wno-error=unused-but-set-variable -D_REENTRANT" PREFIX=/usr \
+	  LDFLAGS="$(LDFLAGS)"
 endif
 
 	: >$@
diff -u xtrs-4.9c/debug.c xtrs-4.9c/debug.c
--- xtrs-4.9c/debug.c
+++ xtrs-4.9c/debug.c
@@ -515,7 +515,7 @@
 	{
 	    if(!strcmp(command, "help") || !strcmp(command, "?"))
 	    {
-		printf(help_message);
+		printf("%s", help_message);
 	    }
 	    else if (!strcmp(command, "zbxinfo"))
 	    {
only in patch2:
unchanged:
--- xtrs-4.9c.orig/dis.c
+++ xtrs-4.9c/dis.c
@@ -2115,7 +2115,7 @@
 	break;
       case A_0:  /* No args */
       case A_0B: /* No args, backskip over last opcode byte */
-	printf (code->name);
+	printf ("%s", code->name);
 	break;
       case A_8R: /* One 8-bit relative address */
 	printf (code->name, (pc + 1 + (char) mem_read(pc)) & 0xffff);