diff -Nru tilix-1.6.4/debian/changelog tilix-1.6.4/debian/changelog
--- tilix-1.6.4/debian/changelog	2017-07-21 20:12:19.000000000 +0000
+++ tilix-1.6.4/debian/changelog	2017-09-21 18:51:34.000000000 +0000
@@ -1,3 +1,9 @@
+tilix (1.6.4-1+rpi1) buster-staging; urgency=medium
+
+  * Build with -O0 to hopefully avoid segfault.
+
+ -- Peter Michael Green <plugwash@raspbian.org>  Thu, 21 Sep 2017 18:51:34 +0000
+
 tilix (1.6.4-1) unstable; urgency=medium
 
   * New upstream version: 1.6.4
diff -Nru tilix-1.6.4/debian/rules tilix-1.6.4/debian/rules
--- tilix-1.6.4/debian/rules	2017-03-19 15:01:40.000000000 +0000
+++ tilix-1.6.4/debian/rules	2017-09-21 18:51:28.000000000 +0000
@@ -5,7 +5,7 @@
 # Define install target dir
 INSTALLDIR = $(CURDIR)/debian/tmp
 
-export DCFLAGS=-O -inline -release -g -version=StdLoggerDisableTrace
+export DCFLAGS=-O0 -inline -release -g -version=StdLoggerDisableTrace
 
 %:
 	dh $@ --parallel --with gnome --with autoreconf