diff --git a/uisimulator/win32/Makefile b/uisimulator/win32/Makefile
index d97845e6f4..69e4281601 100644
--- a/uisimulator/win32/Makefile
+++ b/uisimulator/win32/Makefile
@@ -24,6 +24,7 @@ PLUGINDIR = $(APPDIR)/plugins
 SIMCOMMON = ../common
 
 ISONDIO := $(findstring ONDIO, $(TARGET))
+ISIRIVER := $(findstring IRIVER, $(TARGET))
 ISPLAYER := $(findstring PLAYER, $(TARGET))
 ifeq ($(ISPLAYER), PLAYER)
      MACHINEDIR = $(PLAYDIR)
@@ -98,9 +99,13 @@ endif
 
 ifeq ($(ISPLAYER),PLAYER)
 	LCDSRSC = lcd-playersim.c lcd-player.c lcd-player-charset.c font-player.c
+else
+ifeq ($(ISIRIVER),IRIVER)
+	LCDSRSC = lcd-h100.c sysfont.c font.c
 else
 	LCDSRSC = lcd-recorder.c sysfont.c font.c
 endif
+endif
 COMMONSRCS = io.c stubs.c lcd-common.c sim_icons.c fmradio.c
 
 FIRMSRCS = $(LCDSRSC) id3.c mp3data.c usb.c mpeg.c mp3_playback.c \
diff --git a/uisimulator/x11/Makefile b/uisimulator/x11/Makefile
index 8feb292a20..9b9afe3618 100644
--- a/uisimulator/x11/Makefile
+++ b/uisimulator/x11/Makefile
@@ -23,6 +23,7 @@ PLUGINDIR = $(APPSDIR)/plugins
 SIMCOMMON = ../common
 
 ISONDIO := $(findstring ONDIO, $(TARGET))
+ISIRIVER := $(findstring IRIVER, $(TARGET))
 ISPLAYER := $(findstring PLAYER, $(TARGET))
 ifeq ($(ISPLAYER), PLAYER)
      MACHINEDIR = $(PLAYDIR)
@@ -110,9 +111,13 @@ endif
 
 ifeq ($(ISPLAYER), PLAYER)
 	LCDSRSC = lcd-playersim.c lcd-player.c lcd-player-charset.c font-player.c
+else
+ifeq ($(ISIRIVER),IRIVER)
+	LCDSRSC = lcd-h100.c sysfont.c font.c
 else
 	LCDSRSC = lcd-recorder.c sysfont.c font.c
 endif
+endif
 COMMONSRCS = io.c stubs.c lcd-common.c sim_icons.c fmradio.c
 
 FIRMSRCS = $(LCDSRSC) id3.c mp3data.c usb.c mpeg.c mp3_playback.c \