diff --git a/CHANGES b/CHANGES
index 7bfcbe9e85..945c568254 100755
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,15 @@
+* Asterisk 0.1.7
+ -- Update configuration files and add some missing sounds
+ -- Added ability to include one context in another
+ -- Rewrite of PBX switching
+ -- Major mods to dialler application
+ -- Added Caller*ID spill reception
+ -- Added Dialogic VOX file format support
+ -- Added ADPCM Codec
+ -- Add Tormenta driver (RBS signalling)
+ -- Add Caller*ID spill creation
+ -- Rewrite of translation layer entirely
+ -- Add ability to run PBX without additional thread
 * Asterisk 0.1.6
  -- Make app_dial handle a lack of translators smoothly
  -- Add ISDN4Linux support -- dtmf is weird...
diff --git a/Makefile b/Makefile
index 252e67f909..260d782c47 100755
--- a/Makefile
+++ b/Makefile
@@ -23,11 +23,14 @@ PROC=i586
 
 DEBUG=-g #-pg
 INCLUDE=-Iinclude -I../include
-CFLAGS=-pipe -Wall -Werror -Wmissing-prototypes -Wmissing-declarations -O6 $(DEBUG) $(INCLUDE) -D_REENTRANT
+CFLAGS=-pipe -Wall -Werror -Wmissing-prototypes -Wmissing-declarations -fomit-frame-pointer -O6 $(DEBUG) $(INCLUDE) -D_REENTRANT
 CFLAGS+=$(shell if $(CC) -march=$(PROC) -S -o /dev/null -xc /dev/null >/dev/null 2>&1; then echo "-march=$(PROC)"; fi)
+CFLAGS += -DDO_CRASH
 SUBDIRS=channels pbx apps codecs formats
-LIBS=-ldl -lpthread -lreadline -lncurses # -lefence
-OBJS=io.o sched.o logger.o frame.o loader.o config.o channel.o translate.o file.o say.o pbx.o cli.o md5.o asterisk.o
+LIBS=-ldl -lpthread -lreadline -lncurses -lm # -lefence
+OBJS=io.o sched.o logger.o frame.o loader.o config.o channel.o \
+	translate.o file.o say.o pbx.o cli.o md5.o \
+	ulaw.o callerid.o fskmodem.o asterisk.o 
 CC=gcc
 INSTALL=install
 
@@ -58,11 +61,10 @@ datafiles: all
 	for x in sounds/digits/*; do \
 		install $$x /var/lib/asterisk/sounds/digits ; \
 	done
-	for x in sounds/vm-* sounds/transfer* ; do \
+	for x in sounds/vm-* sounds/transfer* sounds/pbx-* sounds/ss-*; do \
 		install $$x /var/lib/asterisk/sounds ; \
 	done
-
-install: all
+install: all datafiles
 	mkdir -p $(MODULES_DIR)
 	for x in $(SUBDIRS); do $(MAKE) -C $$x install || exit 1 ; done
 	install -d /usr/include/asterisk
diff --git a/configs/extensions.conf.sample b/configs/extensions.conf.sample
index 7dd6b309d2..287ac2238f 100755
--- a/configs/extensions.conf.sample
+++ b/configs/extensions.conf.sample
@@ -73,7 +73,7 @@ exten=#,2,Hangup			; Hang them up.
 ;
 ; A timeout and "invalid extension rule"
 ;
-exten=t,1,Playback,Goto,#|1		; If they take too long, give up
+exten=t,1,Goto,#|1			; If they take too long, give up
 exten=i,1,Playback,invalid		; "That's not valid, try again"
 
 ;
diff --git a/configs/iax.conf.sample b/configs/iax.conf.sample
index 62307d5b9a..f269156b04 100755
--- a/configs/iax.conf.sample
+++ b/configs/iax.conf.sample
@@ -66,7 +66,7 @@ context=default
 type=peer
 username=asterisk
 secret=supersecret
-host=209.16.236.91
+host=216.207.245.57
 ;host=asterisk.linux-support.net
 ;port=5036
 ;mask=255.255.255.255
diff --git a/sounds/invalid.gsm b/sounds/invalid.gsm
new file mode 100755
index 0000000000..f11e274a0e
Binary files /dev/null and b/sounds/invalid.gsm differ
diff --git a/sounds/pbx-transfer.gsm b/sounds/pbx-transfer.gsm
new file mode 100755
index 0000000000..df6fa9f942
Binary files /dev/null and b/sounds/pbx-transfer.gsm differ
diff --git a/sounds/ss-noservice.gsm b/sounds/ss-noservice.gsm
new file mode 100755
index 0000000000..8130f4c73c
Binary files /dev/null and b/sounds/ss-noservice.gsm differ