diff --git a/src/servers/app/server/AppServer.cpp b/src/servers/app/server/AppServer.cpp
index 0eaaf46915..71887b6baf 100644
--- a/src/servers/app/server/AppServer.cpp
+++ b/src/servers/app/server/AppServer.cpp
@@ -84,12 +84,14 @@ AppServer::AppServer(void)
 	// Create the font server and scan the proper directories.
 	fontserver=new FontServer;
 	fontserver->Lock();
-	fontserver->ScanDirectory("/boot/beos/etc/fonts/ttfonts/");
+
+	// Used for testing purposes
 
 	// TODO: Uncomment when actually put to use. Commented out for speed
+//	fontserver->ScanDirectory("/boot/beos/etc/fonts/ttfonts/");
 //	fontserver->ScanDirectory("/boot/beos/etc/fonts/PS-Type1/");
-//	fontserver->ScanDirectory("/boot/home/config/fonts/ttfonts/");
-//	fontserver->ScanDirectory("/boot/home/config/fonts/psfonts/");
+	fontserver->ScanDirectory("/boot/home/config/fonts/ttfonts/");
+	fontserver->ScanDirectory("/boot/home/config/fonts/psfonts/");
 	fontserver->SaveList();
 
 	if(!fontserver->SetSystemPlain(DEFAULT_PLAIN_FONT_FAMILY,DEFAULT_PLAIN_FONT_STYLE,DEFAULT_PLAIN_FONT_SIZE))
diff --git a/src/servers/app/server/FontServer.cpp b/src/servers/app/server/FontServer.cpp
index 928e351bb9..48b4e79615 100644
--- a/src/servers/app/server/FontServer.cpp
+++ b/src/servers/app/server/FontServer.cpp
@@ -41,6 +41,8 @@ extern FTC_Manager ftmanager;
 FT_Library ftlib;
 FontServer *fontserver;
 
+//#define PRINT_FONT_LIST
+
 /*!
 	\brief Access function to request a face via the FreeType font cache
 */
@@ -221,6 +223,10 @@ status_t FontServer::ScanDirectory(const char *fontspath)
 		
 		if(!family)
 		{
+			#ifdef PRINT_FONT_LIST
+			printf("Font Family: %s\n",face->family_name);
+			#endif
+
 			family=new FontFamily(face->family_name);
 			families->AddItem(family);
 		}
@@ -231,6 +237,10 @@ status_t FontServer::ScanDirectory(const char *fontspath)
 			continue;
 		}
 
+		#ifdef PRINT_FONT_LIST
+		printf("\tFont Style: %s\n",face->style_name);
+		#endif
+
 		// Has vertical metrics?
 		family->AddStyle(path.Path(),face);
 		validcount++;
diff --git a/src/servers/app/server/Jamfile b/src/servers/app/server/Jamfile
index a7bc6cd1f4..da29fc5533 100644
--- a/src/servers/app/server/Jamfile
+++ b/src/servers/app/server/Jamfile
@@ -1,5 +1,8 @@
 SubDir OBOS_TOP src servers app server ;
 
+SubInclude OBOS_TOP src servers app server fonts ;
+Depends app_server : install_fonts ;
+
 AddResources app_server : app_server.rsrc ;
 
 UseLibraryHeaders png zlib ;
diff --git a/src/servers/app/server/fonts/Jamfile b/src/servers/app/server/fonts/Jamfile
new file mode 100644
index 0000000000..6881fae20d
--- /dev/null
+++ b/src/servers/app/server/fonts/Jamfile
@@ -0,0 +1,4 @@
+SubDir OBOS_TOP src servers app server fonts ;
+
+SubInclude OBOS_TOP src servers app server fonts psfonts ;
+SubInclude OBOS_TOP src servers app server fonts ttfonts ;
diff --git a/src/servers/app/server/fonts/psfonts/Jamfile b/src/servers/app/server/fonts/psfonts/Jamfile
new file mode 100644
index 0000000000..abcea37144
--- /dev/null
+++ b/src/servers/app/server/fonts/psfonts/Jamfile
@@ -0,0 +1,24 @@
+SubDir OBOS_TOP src servers app server fonts psfonts ;
+
+OBOSInstall install_fonts : [ FDirName $(OBOS_FONTS_DIR) psfonts ] :
+	bchbi.afm
+	bchr.pfb
+	cour.afm
+	courb.pfa
+	couri.afm
+	crb-pc8.afm
+	bchb.afm
+	bchbi.pfb
+	bchri.afm
+	cour.pfa
+	courbi.afm
+	couri.pfa
+	crbi-pc8.afm
+	bchb.pfb
+	bchr.afm
+	bchri.pfb
+	courb.afm
+	courbi.pfa
+	cr-pc8.afm
+	cri-pc8.afm
+;
\ No newline at end of file
diff --git a/src/servers/app/server/fonts/ttfonts/Jamfile b/src/servers/app/server/fonts/ttfonts/Jamfile
new file mode 100644
index 0000000000..b30ea39549
--- /dev/null
+++ b/src/servers/app/server/fonts/ttfonts/Jamfile
@@ -0,0 +1,14 @@
+SubDir OBOS_TOP src servers app server fonts ttfonts ;
+
+OBOSInstall install_fonts : [ FDirName $(OBOS_FONTS_DIR) ttfonts ] :
+	Vera.ttf
+	VeraBd.ttf
+	VeraMoBI.ttf
+	VeraMoIt.ttf
+	VeraSe.ttf
+	VeraBI.ttf
+	VeraIt.ttf
+	VeraMoBd.ttf
+	VeraMono.ttf
+	VeraSeBd.ttf
+;
\ No newline at end of file