diff --git a/.gitignore b/.gitignore
index ccb08fa..d525ada 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,3 +2,5 @@
 bin/*.hh
 *.o
 *.log
+*.so
+compile
diff --git a/.gitreview b/.gitreview
new file mode 100644
index 0000000..ffc7ed4
--- /dev/null
+++ b/.gitreview
@@ -0,0 +1,3 @@
+[gerrit]
+host=gerrit.osmocom.org
+project=osmo-ttcn3-hacks
diff --git a/regen-makefile.sh b/regen-makefile.sh
index 1814699..f757fa3 100755
--- a/regen-makefile.sh
+++ b/regen-makefile.sh
@@ -8,12 +8,16 @@
 #
 # The regexes below patch the generated Makefile to work on Debian 9 and
 # unstable, so far tested with TITAN 6.1.0, 6.2.0 and 6.3.0
+#
 
 ttcn3_makefilegen -l -f $*
 sed -i -e 's/# TTCN3_DIR = /TTCN3_DIR = \/usr/' Makefile
 sed -i -e 's/LDFLAGS = /LDFLAGS = -L \/usr\/lib\/titan /' Makefile
 #sed -i -e 's/TTCN3_LIB = ttcn3-parallel/TTCN3_LIB = ttcn3/' Makefile
-sed -i -e 's/CPPFLAGS = -D$(PLATFORM) -I$(TTCN3_DIR)\/include/CPPFLAGS = -D$(PLATFORM) -I$(TTCN3_DIR)\/include -I\/usr\/include\/titan/' Makefile
+
+# The -DMAKEDEPEND_RUN is a workaround for Debian packaging issue,
+# see https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=879816 for details
+sed -i -e 's/CPPFLAGS = -D$(PLATFORM) -I$(TTCN3_DIR)\/include/CPPFLAGS = -D$(PLATFORM) -DMAKEDEPEND_RUN -I$(TTCN3_DIR)\/include -I\/usr\/include\/titan/' Makefile
 
 # for TITAN 6.3.0
 sed -i -e 's/TTCN3_DIR = $/TTCN3_DIR = \/usr/' Makefile
diff --git a/rmlinks.sh b/rmlinks.sh
index 58ca6f3..2b356a5 100755
--- a/rmlinks.sh
+++ b/rmlinks.sh
@@ -1,2 +1,2 @@
 #!/bin/sh
-find . -type l -exec rm \{\} \;
+find . -type l -not -path "./bin/*" -not -path "./M3UA_CNL113537/*" -not -path "./SCCP_CNL113341/*" -exec rm \{\} \;