diff --git a/apps/app_playback.c b/apps/app_playback.c
index be2dfe26e5..d7e023d944 100755
--- a/apps/app_playback.c
+++ b/apps/app_playback.c
@@ -43,8 +43,10 @@ static int playback_exec(struct ast_channel *chan, void *data)
 	if (!res) {
 		ast_stopstream(chan);
 		res = ast_streamfile(chan, (char *)data, chan->language);
-		if (!res)
+		if (!res) 
 			res = ast_waitstream(chan, "");
+		else
+			ast_log(LOG_WARNING, "ast_streamfile failed on %s for %s\n", chan->name, (char *)data);
 		ast_stopstream(chan);
 	}
 	LOCAL_USER_REMOVE(u);
diff --git a/asterisk.c b/asterisk.c
index 4addf889c9..de86f561bf 100755
--- a/asterisk.c
+++ b/asterisk.c
@@ -48,6 +48,19 @@ static void urg_handler(int num)
 	return;
 }
 
+static void set_title(char *text)
+{
+	/* Set an X-term or screen title */
+	if (getenv("TERM") && strstr(getenv("TERM"), "xterm"))
+		fprintf(stdout, "\033]2;%s\007", text);
+}
+
+static void set_icon(char *text)
+{
+	if (getenv("TERM") && strstr(getenv("TERM"), "xterm"))
+		fprintf(stdout, "\033]1;%s\007", text);
+}
+
 static int set_priority(int pri)
 {
 	struct sched_param sched;
@@ -210,6 +223,10 @@ int main(int argc, char *argv[])
 	if (option_console) {
 		/* Console stuff now... */
 		/* Register our quit function */
+		char title[256];
+		set_icon("Asterisk");
+		snprintf(title, sizeof(title), "Asterisk Console (pid %d)", getpid());
+		set_title(title);
 	    ast_cli_register(&quit);
 		consolethread = pthread_self();
 		if (strlen(filename))
diff --git a/channels/chan_phone.c b/channels/chan_phone.c
index cb7e464d36..6b59574242 100755
--- a/channels/chan_phone.c
+++ b/channels/chan_phone.c
@@ -34,7 +34,7 @@
 #include <linux/ixjuser.h>
 #include "DialTone.h"
 
-#define phone_MAX_BUF 480
+#define PHONE_MAX_BUF 480
 
 static char *desc = "Linux Telephony API Support";
 static char *type = "Phone";
@@ -74,6 +74,7 @@ static int restart_monitor(void);
    
 #define MODE_DIALTONE 	1
 #define MODE_IMMEDIATE	2
+#define MODE_FXO		3
    
 static struct phone_pvt {
 	int fd;							/* Raw file descriptor for this device */
@@ -86,12 +87,12 @@ static struct phone_pvt {
 	struct phone_pvt *next;			/* Next channel in list */
 	struct ast_frame fr;			/* Frame */
 	char offset[AST_FRIENDLY_OFFSET];
-	char buf[phone_MAX_BUF];					/* Static buffer for reading frames */
+	char buf[PHONE_MAX_BUF];					/* Static buffer for reading frames */
 	int obuflen;
 	int dialtone;
 	int silencesupression;
 	char context[AST_MAX_EXTENSION];
-	char obuf[phone_MAX_BUF * 2];
+	char obuf[PHONE_MAX_BUF * 2];
 	char ext[AST_MAX_EXTENSION];
 	char language[MAX_LANGUAGE];
 } *iflist = NULL;
@@ -165,6 +166,13 @@ static int phone_hangup(struct ast_channel *ast)
 		ast_log(LOG_WARNING, "Failed to stop ringing\n");
 	if (ioctl(p->fd, PHONE_CPT_STOP))
 		ast_log(LOG_WARNING, "Failed to stop sounds\n");
+
+	/* If it's an FXO, hang them up */
+	if (p->mode == MODE_FXO) {
+		if (ioctl(p->fd, PHONE_PSTN_SET_STATE, PSTN_ON_HOOK)) 
+			ast_log(LOG_DEBUG, "ioctl(PHONE_PSTN_SET_STATE) failed on %s (%s)\n",ast->name, strerror(errno));
+	}
+
 	/* If they're off hook, give a busy signal */
 	if (ioctl(p->fd, PHONE_HOOKSTATE)) {
 		if (option_debug)
@@ -230,6 +238,15 @@ static int phone_setup(struct ast_channel *ast)
 
 static int phone_answer(struct ast_channel *ast)
 {
+	struct phone_pvt *p;
+	p = ast->pvt->pvt;
+	/* In case it's a LineJack, take it off hook */
+	if (p->mode == MODE_FXO) {
+		if (ioctl(p->fd, PHONE_PSTN_SET_STATE, PSTN_OFF_HOOK)) 
+			ast_log(LOG_DEBUG, "ioctl(PHONE_PSTN_SET_STATE) failed on %s (%s)\n", ast->name, strerror(errno));
+		else
+			ast_log(LOG_DEBUG, "Took linejack off hook\n");
+	}
 	phone_setup(ast);
 	if (option_debug)
 		ast_log(LOG_DEBUG, "phone_answer(%s)\n", ast->name);
@@ -267,6 +284,8 @@ static struct ast_frame  *phone_read(struct ast_channel *ast)
 
 	phonee.bytes = ioctl(p->fd, PHONE_EXCEPTION);
 	if (phonee.bits.dtmf_ready)  {
+		ast_log(LOG_DEBUG, "phone_read(): DTMF\n");
+	
 		/* We've got a digit -- Just handle this nicely and easily */
 		digit =  ioctl(p->fd, PHONE_GET_DTMF_ASCII);
 		p->fr.subclass = digit;
@@ -274,9 +293,11 @@ static struct ast_frame  *phone_read(struct ast_channel *ast)
 		return &p->fr;
 	}
 	if (phonee.bits.hookstate) {
+		ast_log(LOG_DEBUG, "Hookstate changed\n");
 		res = ioctl(p->fd, PHONE_HOOKSTATE);
 		/* See if we've gone on hook, if so, notify by returning NULL */
-		if (!res)
+		ast_log(LOG_DEBUG, "New hookstate: %d\n", res);
+		if (!res && (p->mode != MODE_FXO))
 			return NULL;
 		else {
 			if (ast->state == AST_STATE_RINGING) {
@@ -290,16 +311,18 @@ static struct ast_frame  *phone_read(struct ast_channel *ast)
 				ast_log(LOG_WARNING, "Got off hook in weird state %d\n", ast->state);
 		}
 	}
-#if 0
+#if 1
 	if (phonee.bits.pstn_ring)
 		ast_verbose("Unit is ringing\n");
 	if (phonee.bits.caller_id) {
 		ast_verbose("We have caller ID: %s\n");
 	}
+	if (phonee.bits.pstn_wink)
+		ast_verbose("Detected Wink\n");
 #endif
 	/* Try to read some data... */
 	CHECK_BLOCKING(ast);
-	res = read(p->fd, p->buf, phone_MAX_BUF);
+	res = read(p->fd, p->buf, PHONE_MAX_BUF);
 	ast->blocking = 0;
 	if (res < 0) {
 #if 0
@@ -618,8 +641,10 @@ static void phone_check_exception(struct phone_pvt *i)
 			i->dialtone = 0;
 		}
 	}
-	if (phonee.bits.pstn_ring)
+	if (phonee.bits.pstn_ring) {
 		ast_verbose("Unit is ringing\n");
+		phone_new(i, AST_STATE_RING, i->context);
+	}
 	if (phonee.bits.caller_id)
 		ast_verbose("We have caller ID\n");
 	
@@ -793,10 +818,16 @@ static struct phone_pvt *mkif(char *iface, int mode)
 			free(tmp);
 			return NULL;
 		}
+		if (mode == MODE_FXO) {
+			if (ioctl(tmp->fd, IXJCTL_PORT, PORT_PSTN)) 
+				ast_log(LOG_DEBUG, "Unable to set port to PSTN\n");
+		}
 		ioctl(tmp->fd, PHONE_PLAY_STOP);
 		ioctl(tmp->fd, PHONE_REC_STOP);
 		ioctl(tmp->fd, PHONE_RING_STOP);
 		ioctl(tmp->fd, PHONE_CPT_STOP);
+		if (ioctl(tmp->fd, PHONE_PSTN_SET_STATE, PSTN_ON_HOOK)) 
+			ast_log(LOG_DEBUG, "ioctl(PHONE_PSTN_SET_STATE) failed on %s (%s)\n",iface, strerror(errno));
 		if (echocancel != AEC_OFF)
 			ioctl(tmp->fd, IXJCTL_AEC_START, echocancel);
 		if (silencesupression) 
@@ -900,6 +931,8 @@ int load_module()
 				mode = MODE_DIALTONE;
 			else if (!strncasecmp(v->value, "im", 2))
 				mode = MODE_IMMEDIATE;
+			else if (!strncasecmp(v->value, "fx", 2))
+				mode = MODE_FXO;
 			else
 				ast_log(LOG_WARNING, "Unknown mode: %s\n", v->value);
 		} else if (!strcasecmp(v->name, "context")) {