diff --git a/makehdimage b/makehdimage
index 8f86ff2756..4e20843d07 100755
--- a/makehdimage
+++ b/makehdimage
@@ -381,6 +381,12 @@ $cp ${sPrefix}data/system/boot/Bootscript \
 	${sPrefix}data/system/boot/SetupEnvironment \
 	${sPrefix}data/system/boot/Netscript $targetDir/beos/system/boot/
 $cp ${sPrefix}data/etc/profile ${sPrefix}data/etc/termcap $targetDir/beos/etc/
+$cp -r ${sPrefix}data/etc/fonts $targetDir/beos/etc/
+if [ -e /boot/beos/etc/fonts/ttfonts/Swiss721.ttf ]; then
+	$cp ${sPrefix}/boot/beos/etc/fonts/ttfonts/Courier10Pitch.ttf $targetDir/beos/etc/fonts/ttfonts/
+	$cp ${sPrefix}/boot/beos/etc/fonts/ttfonts/Swiss721_Bold.ttf $targetDir/beos/etc/fonts/ttfonts/
+	$cp ${sPrefix}/boot/beos/etc/fonts/ttfonts/Swiss721.ttf $targetDir/beos/etc/fonts/ttfonts/
+fi
 $cp ${sPrefix}src/tests/kernel/boot_floppy/fortune/fortunes $targetDir/beos/etc/
 $cp -r ${sPrefix}distro/${arch}.R1/beos/etc $targetDir/beos/
 
@@ -503,19 +509,6 @@ for f in $BEOS_NETWORK_PROTOCOLS; do
 	$cp ${sPrefix}$f $targetDir/beos/system/add-ons/kernel/network/protocols
 done
 
-# install fonts
-
-echo "Installing fonts..."
-
-cd $sourceDir/distro/${arch}.R1/beos/etc/
-$cd ${sPrefix}$sourceDir/distro/${arch}.R1/beos/etc/
-$cp -r ${sPrefix}fonts $targetDir/beos/etc/
-if [ -e /boot/beos/etc/fonts/ttfonts/Swiss721.ttf ]; then
-	$cp ${sPrefix}/boot/beos/etc/fonts/ttfonts/Courier10Pitch.ttf $targetDir/beos/etc/fonts/ttfonts/
-	$cp ${sPrefix}/boot/beos/etc/fonts/ttfonts/Swiss721_Bold.ttf $targetDir/beos/etc/fonts/ttfonts/
-	$cp ${sPrefix}/boot/beos/etc/fonts/ttfonts/Swiss721.ttf $targetDir/beos/etc/fonts/ttfonts/
-fi
-
 # install MIME database
 mimeDBSource=$sourceDir/src/data/beos_mime
 mimeDBDest=$targetDir/home/config/settings/beos_mime
diff --git a/src/servers/app/Jamfile b/src/servers/app/Jamfile
index 65f8e0a0d0..657b031fae 100644
--- a/src/servers/app/Jamfile
+++ b/src/servers/app/Jamfile
@@ -1,7 +1,5 @@
 SubDir OBOS_TOP src servers app ;
 
-Depends app_server : install_fonts ;
-
 AddResources app_server : app_server.rdef ;
 
 UseLibraryHeaders agg png zlib ;
@@ -132,5 +130,4 @@ if $(TARGET_PLATFORM) = haiku {
 		libagg.a libfreetype.so textencoding ;
 }
 
-SubInclude OBOS_TOP src servers app fonts ;
 SubInclude OBOS_TOP src servers app drawing Painter ;