Index: calendar-impl/impl/src/java/org/sakaiproject/calendar/impl/BaseCalendarService.java
===================================================================
--- calendar-impl/impl/src/java/org/sakaiproject/calendar/impl/BaseCalendarService.java	(revision 47064)
+++ calendar-impl/impl/src/java/org/sakaiproject/calendar/impl/BaseCalendarService.java	(working copy)
@@ -22,11 +22,12 @@
 package org.sakaiproject.calendar.impl;
 
 import java.io.ByteArrayOutputStream;
+import java.io.File;
 import java.io.InputStream;
 import java.io.OutputStream;
-import java.text.DecimalFormat;
 import java.net.URI;
 import java.net.URISyntaxException;
+import java.text.DecimalFormat;
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Collections;
@@ -64,19 +65,22 @@
 import net.fortuna.ical4j.model.component.VEvent;
 import net.fortuna.ical4j.model.parameter.Value;
 import net.fortuna.ical4j.model.property.CalScale;
+import net.fortuna.ical4j.model.property.Comment;
+import net.fortuna.ical4j.model.property.Description;
+import net.fortuna.ical4j.model.property.Location;
+import net.fortuna.ical4j.model.property.Organizer;
 import net.fortuna.ical4j.model.property.ProdId;
 import net.fortuna.ical4j.model.property.TzId;
 import net.fortuna.ical4j.model.property.Uid;
 import net.fortuna.ical4j.model.property.Version;
-import net.fortuna.ical4j.model.property.Location;
-import net.fortuna.ical4j.model.property.Description;
-import net.fortuna.ical4j.model.property.Comment;
-import net.fortuna.ical4j.model.property.Organizer;
 
 import org.apache.avalon.framework.logger.ConsoleLogger;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.apache.fop.apps.Driver;
+import org.apache.fop.apps.FOPException;
+import org.apache.fop.apps.Options;
+import org.apache.fop.configuration.Configuration;
 import org.apache.fop.messaging.MessageHandler;
 import org.sakaiproject.alias.api.Alias;
 import org.sakaiproject.alias.cover.AliasService;
@@ -91,13 +95,13 @@
 import org.sakaiproject.calendar.api.CalendarEventEdit;
 import org.sakaiproject.calendar.api.CalendarEventVector;
 import org.sakaiproject.calendar.api.CalendarService;
-import org.sakaiproject.calendar.cover.ExternalCalendarSubscriptionService;
 import org.sakaiproject.calendar.api.RecurrenceRule;
 import org.sakaiproject.calendar.api.CalendarEvent.EventAccess;
+import org.sakaiproject.calendar.cover.ExternalCalendarSubscriptionService;
 import org.sakaiproject.component.api.ServerConfigurationService;
 import org.sakaiproject.component.cover.ComponentManager;
+import org.sakaiproject.content.api.ContentHostingService;
 import org.sakaiproject.content.api.ContentResource;
-import org.sakaiproject.content.api.ContentHostingService;
 import org.sakaiproject.entity.api.ContextObserver;
 import org.sakaiproject.entity.api.Edit;
 import org.sakaiproject.entity.api.Entity;
@@ -136,8 +140,8 @@
 import org.sakaiproject.tool.api.SessionBindingListener;
 import org.sakaiproject.tool.cover.SessionManager;
 import org.sakaiproject.tool.cover.ToolManager;
+import org.sakaiproject.user.api.UserNotDefinedException;
 import org.sakaiproject.user.cover.UserDirectoryService;
-import org.sakaiproject.user.api.UserNotDefinedException;
 import org.sakaiproject.util.BaseResourcePropertiesEdit;
 import org.sakaiproject.util.CalendarUtil;
 import org.sakaiproject.util.DefaultEntityHandler;
@@ -5253,6 +5257,10 @@
 	protected final static String MONTH_VIEW_XSLT_FILENAME = "schedulemm.xsl";
 
 	protected final static String WEEK_VIEW_XSLT_FILENAME = "schedule.xsl";
+	
+	// FOP Configuration
+	protected final static String FOP_USERCONFIG = "fonts/userconfig.xml";
+	protected final static String FOP_FONTBASEDIR = "fonts";
 
 	// Mime Types
 	protected final static String PDF_MIME_TYPE = "application/pdf";
@@ -6008,6 +6016,17 @@
 		MessageHandler.setScreenLogger(logger);
 		driver.setLogger(logger);
 
+		try {
+			String baseDir = getClass().getClassLoader().getResource(FOP_FONTBASEDIR).toString();
+			Configuration.put("fontBaseDir", baseDir);
+			InputStream userConfig = getClass().getClassLoader().getResourceAsStream(FOP_USERCONFIG);
+			Options options = new Options(userConfig);
+		}catch (FOPException fe){
+			fe.printStackTrace();
+		}catch(Exception e){
+			e.printStackTrace();
+		}
+
 		driver.setOutputStream(streamOut);
 		driver.setRenderer(Driver.RENDER_PDF);
 
Index: calendar-impl/impl/src/config/schedule.xsl
===================================================================
--- calendar-impl/impl/src/config/schedule.xsl	(revision 47064)
+++ calendar-impl/impl/src/config/schedule.xsl	(working copy)
@@ -556,7 +556,7 @@
 <!-- end scheduleUtil templates -->
 
 <xsl:template match="schedule">
-<fo:root xmlns:fo="http://www.w3.org/1999/XSL/Format">  
+<fo:root xmlns:fo="http://www.w3.org/1999/XSL/Format" font-family="DejaVuSans">  
   <!-- defines page layout -->
   <fo:layout-master-set>
 
@@ -593,7 +593,7 @@
     <fo:static-content flow-name="xsl-region-before">
    		<xsl:variable name="frm-len" select="$frmlen"/>
 		<fo:block font-size="12pt" 
-            font-family="sans-serif"
+            font-family="DejaVuSans"
             font-weight="bold" 
             line-height="0.5cm"
             space-after.optimum="1pt"
Index: calendar-impl/impl/src/config/schedulemm.xsl
===================================================================
--- calendar-impl/impl/src/config/schedulemm.xsl	(revision 47064)
+++ calendar-impl/impl/src/config/schedulemm.xsl	(working copy)
@@ -31,7 +31,7 @@
 <xsl:variable name="cols" select="7"/>
 <xsl:template match="/">
 
-<fo:root xmlns:fo="http://www.w3.org/1999/XSL/Format">
+<fo:root xmlns:fo="http://www.w3.org/1999/XSL/Format" font-family="DejaVuSans">
 
   <fo:layout-master-set>
     <!-- page layout -->
@@ -58,7 +58,7 @@
 
   <fo:static-content flow-name="xsl-region-before">
 	<fo:block font-size="18pt" 
-            font-family="sans-serif" 
+            font-family="DejaVuSans" 
             line-height="1cm"
             space-after.optimum="1pt"
             color="black"
@@ -73,7 +73,7 @@
    
    <fo:static-content flow-name="xsl-region-after">
 		<fo:block text-align="end" 
-			font-size="10pt" font-family="serif" line-height="1em + 2pt">
+			font-size="10pt" font-family="DejaVuSans" line-height="1em + 2pt">
 			- <fo:page-number/> -
       </fo:block>
   </fo:static-content>
Index: calendar-impl/impl/src/config/schlist.xsl
===================================================================
--- calendar-impl/impl/src/config/schlist.xsl	(revision 47064)
+++ calendar-impl/impl/src/config/schlist.xsl	(working copy)
@@ -13,7 +13,7 @@
 <xsl:param name="from"/>
         
 <xsl:template match="schedule">
-<fo:root xmlns:fo="http://www.w3.org/1999/XSL/Format">
+<fo:root xmlns:fo="http://www.w3.org/1999/XSL/Format" font-family="DejaVuSans">
 
   <fo:layout-master-set>
     <!-- page layout -->
@@ -39,7 +39,7 @@
    
 	
 	<fo:block font-size="12pt" 
-            font-family="verdana, sans-serif" 
+            font-family="DejaVuSans" 
             line-height="1cm"
             space-after.optimum="1pt"
             color="black"
@@ -89,7 +89,7 @@
         <fo:list-item>
           <!-- insert a bullet -->
           <fo:list-item-label end-indent="label-end()">
-          	<fo:block><fo:inline   font-size="7pt" font-family="verdana,sans-serif">
+          	<fo:block><fo:inline   font-size="7pt" font-family="DejaVuSans">
 			    <xsl:value-of select="@dt"/></fo:inline></fo:block>
           </fo:list-item-label>
           <!-- list text --> 
Index: calendar-impl/impl/pom.xml
===================================================================
--- calendar-impl/impl/pom.xml	(revision 47064)
+++ calendar-impl/impl/pom.xml	(working copy)
@@ -159,6 +159,8 @@
         <directory>${basedir}/src/config</directory>
         <includes>
           <include>**/*.xsl</include>
+          <include>**/*.xml</include>
+          <include>**/*.ttf</include>
         </includes>
       </resource>
       <resource>