Index: io.c
===================================================================
diff --git a/head/usr.bin/calendar/io.c b/head/usr.bin/calendar/io.c
--- a/head/usr.bin/calendar/io.c	(revision 251225)
+++ b/head/usr.bin/calendar/io.c	(working copy)
@@ -274,7 +274,7 @@
 		}
 		execl(_PATH_CPP, "cpp", "-P",
 		    "-traditional", "-nostdinc",	/* GCC specific opts */
-		    "-I.", "-I", _PATH_INCLUDE, (char *)NULL);
+		    "-I.", "-I"_PATH_INCLUDE, (char *)NULL);
 		warn(_PATH_CPP);
 		_exit(1);
 	}
Index: pathnames.h
===================================================================
diff --git a/head/usr.bin/calendar/pathnames.h b/head/usr.bin/calendar/pathnames.h
--- a/head/usr.bin/calendar/pathnames.h	(revision 251225)
+++ b/head/usr.bin/calendar/pathnames.h	(working copy)
@@ -32,5 +32,5 @@
 
 #include <paths.h>
 
-#define	_PATH_CPP	"/usr/bin/cpp"
+#define	_PATH_CPP	"/usr/bin/tradcpp"
 #define	_PATH_INCLUDE	"/usr/share/calendar"