diff --git a/apps/settings_list.c b/apps/settings_list.c
index d6f5f94..6226c1f 100644
--- a/apps/settings_list.c
+++ b/apps/settings_list.c
@@ -223,6 +223,13 @@ static const char graphic_numeric[] = "graphic,numeric";
   #define DEFAULT_FONTNAME ""
 #endif

+#ifdef HAVE_REMOTE_LCD
+#if LCD_REMOTE_HEIGHT <= 64
+  #define DEFAULT_REMOTE_FONTNAME "08-Rockfont"
+#else
+  #define DEFAULT_REMOTE_FONTNAME "-"
+#endif /* HAVE_REMOTE_LCD */
+
 #ifdef HAVE_LCD_COLOR
   #define DEFAULT_ICONSET "tango_small"
   #define DEFAULT_VIEWERS_ICONSET "tango_small_viewers"
@@ -1564,7 +1571,7 @@ const struct settings_list settings[] = {
 #endif
 #ifdef HAVE_REMOTE_LCD
     TEXT_SETTING(F_THEMESETTING, remote_font_file, "remote font",
-                     "-", FONT_DIR "/", ".fnt"),
+                     DEFAULT_REMOTE_FONTNAME, FONT_DIR "/", ".fnt"),
 #endif
     TEXT_SETTING(F_THEMESETTING,wps_file, "wps",
                      DEFAULT_WPSNAME, WPS_DIR "/", ".wps"),
diff --git a/wps/WPSLIST b/wps/WPSLIST
index 856022c..3707c4a 100644
--- a/wps/WPSLIST
+++ b/wps/WPSLIST
@@ -308,6 +308,9 @@ Font.132x80x16: 11-Sazanami-Mincho.fnt
 Font.128x64x1: 08-Rockfont.fnt
 Font.112x64x1: 08-Rockfont.fnt

+# Remote font for iriver
+Remote Font.128x64x1: 08-Rockfont.fnt
+
 #misc settings that should be ignored on grayscale targets
 foreground color: CCCCCC
 background color: 000000
@@ -380,6 +383,5 @@ remote ui viewport:
 <rwps>
 Name: cabbiev2.rwps
 Author: Johannes Voggenthaler, Apoo Maha, Marc Guay, Alex Vanderpol, Jerry Lange, Keith Perri, Mark Fawcus, and Marianne Arnold with support from Rockbox developers and forums. Based on Cabbie by Yohann Misquitta.
-Font: 12-Adobe-Helvetica.fnt
 Statusbar: top
 </rwps>
diff --git a/wps/wpsbuild.pl b/wps/wpsbuild.pl
index 81a90f3..57dc3de 100755
--- a/wps/wpsbuild.pl
+++ b/wps/wpsbuild.pl
@@ -47,6 +47,7 @@ my $rsbs_w_size;
 my $width;
 my $height;
 my $font;
+my $remotefont;
 my $fgcolor;
 my $bgcolor;
 my $statusbar;
@@ -160,11 +161,11 @@ sub copybackdrop
 sub copythemefont
 {
     #copy the font specified by the theme
+    my $o = $_[0];

-    my $o=$font;
     $o =~ s/\.fnt/\.bdf/;
     mkdir "$rbdir/fonts";
-    my $cmd ="$ROOT/tools/convbdf -f -o \"$rbdir/fonts/$font\" \"$ROOT/fonts/$o\" ";
+    my $cmd ="$ROOT/tools/convbdf -f -o \"$rbdir/fonts/$_[0]\" \"$ROOT/fonts/$o\" ";
     `$cmd`;
 }

@@ -288,6 +289,13 @@ MOO
             push @out, "font: /$rbdir/fonts/$font\n";
         }
     }
+    if(defined($remotefont) && $has_remote) {
+        if ($remotefont eq '') {
+            push @out, "remote font: -\n";
+        } else {
+            push @out, "remote font: /$rbdir/fonts/$remotefont\n";
+        }
+    }
     if($fgcolor && $main_depth > 2) {
         push @out, "foreground color: $fgcolor\n";
     }
@@ -405,6 +413,7 @@ while(<WPS>) {
         undef $width;
         undef $height;
         undef $font;
+        undef $remotefont;
         undef $fgcolor;
         undef $bgcolor;
         undef $statusbar;
@@ -492,7 +501,10 @@ while(<WPS>) {
                     copythemeviewericon();
                 }
                 if ($font) {
-                    copythemefont();
+                    copythemefont($font);
+                }
+                if ($remotefont) {
+                    copythemefont($remotefont);
                 }
                 if(!$isrwps) {
                     # We only make .cfg files for <wps> sections:
@@ -554,6 +566,12 @@ while(<WPS>) {
         elsif($l =~ /^Font\.${main_width}x${main_height}x$main_depth: *(.*)/i) {
             $font = $1;
         }
+        elsif($l =~ /^Remote Font\.${remote_width}x${remote_height}x$remote_depth: *(.*)/i) {
+            $remotefont = $1;
+        }
+        elsif($l =~ /^Remote Font: *(.*)/i) {
+            $remotefont = $1;
+        }
         elsif($l =~ /^Foreground Color: *(.*)/i) {
             $fgcolor = $1;
         }