Index: apps/app_morsecode.c
===================================================================
--- apps/app_morsecode.c	(revision 8264)
+++ apps/app_morsecode.c	(working copy)
@@ -125,6 +125,14 @@
 		return 0;
 	}
 
+	/*
+	 * Keep in mind that (from http://en.wikipedia.org/wiki/Morse_code)
+	 *
+	 *	"In text-book, full-speed Morse, a dah is conventionally 3 times
+	 *	as long as a dit. Spacing between dits and dahs in a character
+	 *	is the length of one dit. Spacing between letters in a word is
+	 *	the length of a dah (3 dits). Spacing between words is 7 dits."
+	 */
 	for (digit = data; *digit; digit++) {
 		char *dahdit;
 		if (*digit < 0) {
@@ -135,6 +143,9 @@
 				playtone(chan, TONE, 3);
 			} else if (*dahdit == '.') {
 				playtone(chan, TONE, 1);
+			} else if (*dahdit == ' ') {
+				/* Pause between words */
+				playtone(chan, 0, 7);
 			} else {
 				/* Account for ditlen of silence immediately following */
 				playtone(chan, 0, 2);
@@ -144,7 +155,7 @@
 			playtone(chan, 0, 1);
 		}
 		/* Pause between characters */
-		playtone(chan, 0, 2);
+		playtone(chan, 0, 3);
 	}
 
 	LOCAL_USER_REMOVE(u);