diff --git a/uisimulator/x11/Makefile b/uisimulator/x11/Makefile
index abf63cba24..074b7f02ac 100644
--- a/uisimulator/x11/Makefile
+++ b/uisimulator/x11/Makefile
@@ -104,7 +104,8 @@ OBJS := $(OBJDIR)/lang.o $(SRCS:%.c=$(OBJDIR)/%.o)
 all: $(TARGET) $(EXTRA_TARGETS)
 
 clean:
-	$(RM) $(OBJS) *~ core $(TARGET) $(CLIENTS)
+	$(RM) $(OBJS) *~ core $(TARGET) $(CLIENTS) $(OBJDIR)/lang.[cho] \
+	$(OBJDIR)/build.lang $(OBJDIR)/*.o $(OBJDIR)/sysfont.c
 	$(RM) -r $(DEPS)
 
 distclean: clean
@@ -215,8 +216,11 @@ $(OBJDIR)/playlist.o: $(APPDIR)/playlist.c
 $(OBJDIR)/showtext.o: $(APPDIR)/showtext.c
 	$(CC) $(APPCFLAGS) -c $< -o $@
 
-$(OBJDIR)/lang.o: $(APPDIR)/lang/$(LANGUAGE).lang
-	$(TOOLSDIR)/genlang -p=$(OBJDIR)/lang $<
+$(OBJDIR)/build.lang: $(APPDIR)/lang/$(LANGUAGE).lang
+	perl $(TOOLSDIR)/uplang $(APPDIR)/lang/english.lang $< > $@
+
+$(OBJDIR)/lang.o: $(OBJDIR)/build.lang
+	perl -s $(TOOLSDIR)/genlang -p=$(OBJDIR)/lang $<
 	$(CC) $(CFLAGS) -c $(OBJDIR)/lang.c -o $@
 
 $(OBJDIR)/lcd-recorder.o: $(DRIVERS)/lcd-recorder.c