diff -ur icewm-1.2.13+CVS20040510/configure.in bidi_icewm-1.2.13+CVS20040510/configure.in
--- icewm-1.2.13+CVS20040510/configure.in	2004-05-06 17:33:39.000000000 +0300
+++ bidi_icewm-1.2.13+CVS20040510/configure.in	2004-06-06 21:35:21.000000000 +0300
@@ -647,6 +647,33 @@
       [ Name of a root window property indicating that GNOME is active.])
   fi
 
+
+dnl ======================================================== FriBiDi support ===
+dnl
+ICE_ARG_WITH(fribidi,
+  [  --with-fribidi[=path]     Use fribidi [path to fribidi-config]])
+
+if test "${with_fribidi_sign}" != "no"; then
+  if test "${with_fribidi_sign}" != "yes"; then
+    with_fribidi_sign=no              # --- no fribidi support by default ---
+  fi
+fi
+
+dnl ---------------------------------------------------- check for FriBidi ---
+dnl
+if test "${with_fribidi_sign}" = "yes"; then
+  AC_PATH_PROG(FRIBIDI_CONFIG, fribidi-config,, ${with_fribidi_arg-${PATH}})
+  if test "${FRIBIDI_CONFIG}" = ""; then
+    AC_MSG_ERROR([fribidi-config can not be found])
+  else 
+    FRIBIDI_CFLAGS=`$FRIBIDI_CONFIG --cflags`
+    FRIBIDI_LIBS=`$FRIBIDI_CONFIG --libs`
+
+    AC_DEFINE(CONFIG_FRIBIDI, 1, [Define to use FriBiDi])
+  fi
+fi
+
+
 dnl ========================================================== Image library ===
 dnl
 ICE_ARG_WITH(imlib,
@@ -833,12 +860,14 @@
 AC_SUBST(GCCDEP)
 AC_SUBST(CORE_CFLAGS)
 AC_SUBST(IMAGE_CFLAGS)
+AC_SUBST(FRIBIDI_CFLAGS)
 AC_SUBST(AUDIO_CFLAGS)
 AC_SUBST(GNOME1_CFLAGS)
 AC_SUBST(GNOME2_CFLAGS)
 
 AC_SUBST(CORE_LIBS)
 AC_SUBST(IMAGE_LIBS)
+AC_SUBST(FRIBIDI_LIBS)
 AC_SUBST(AUDIO_LIBS)
 AC_SUBST(GNOME1_LIBS)
 AC_SUBST(GNOME2_LIBS)
diff -ur icewm-1.2.13+CVS20040510/src/config.h.in bidi_icewm-1.2.13+CVS20040510/src/config.h.in
--- icewm-1.2.13+CVS20040510/src/config.h.in	2004-05-06 17:36:12.000000000 +0300
+++ bidi_icewm-1.2.13+CVS20040510/src/config.h.in	2004-06-06 18:31:01.000000000 +0300
@@ -42,6 +42,9 @@
 /* Define to use Imlib for image rendering */
 #undef CONFIG_IMLIB
 
+/* Define to use fribidi for bidi support */
+#undef CONFIG_FRIBIDI
+
 /* Define when using libiconv */
 #undef CONFIG_LIBICONV
 
diff -ur icewm-1.2.13+CVS20040510/src/Makefile.in bidi_icewm-1.2.13+CVS20040510/src/Makefile.in
--- icewm-1.2.13+CVS20040510/src/Makefile.in	2004-04-27 15:51:05.000000000 +0300
+++ bidi_icewm-1.2.13+CVS20040510/src/Makefile.in	2004-06-07 04:10:31.000000000 +0300
@@ -34,12 +34,14 @@
                 -DICEHELPIDX='"$(DOCDIR)/icewm-$(VERSION)/icewm.html"'
 
 CXXFLAGS =      @CXXFLAGS@ $(DEBUG) $(DEFS) \
-	        @CORE_CFLAGS@ @IMAGE_CFLAGS@ @AUDIO_CFLAGS@ # `fc-config --cflags`
+	        @CORE_CFLAGS@ @IMAGE_CFLAGS@ @AUDIO_CFLAGS@ @FRIBIDI_CFLAGS@ \
+		# `fc-config --cflags`
 LFLAGS =	@LDFLAGS@
 LIBS =          @LIBS@
 
 CORE_LIBS =     @CORE_LIBS@ # `fc-config --libs`
 IMAGE_LIBS =    @IMAGE_LIBS@
+FRIBIDI_LIBS =  @FRIBIDI_LIBS@
 AUDIO_LIBS =    @AUDIO_LIBS@
 GNOME1_LIBS =    @GNOME1_LIBS@
 GNOME2_LIBS =    @GNOME2_LIBS@
@@ -64,7 +66,7 @@
 	genpref.o
 
 icewm_LIBS = \
-	$(CORE_LIBS) $(IMAGE_LIBS)
+	$(CORE_LIBS) $(IMAGE_LIBS) $(FRIBIDI_LIBS)
 icewm_OBJS = \
         ymsgbox.o ydialog.o yurl.o \
         wmsession.o wmwinlist.o wmtaskbar.o wmwinmenu.o \
@@ -86,7 +88,7 @@
 	icesh.o misc.o
 
 icewm-session_LIBS = \
-	$(CORE_LIBS) $(IMAGE_LIBS)
+	$(CORE_LIBS) $(IMAGE_LIBS) $(FRIBIDI_LIBS)
 icewm-session_OBJS = \
 	icesm.o $(libice_OBJS)
 
@@ -96,7 +98,7 @@
 	icewmhint.o
 
 icewmbg_LIBS = \
-	$(CORE_LIBS) $(IMAGE_LIBS)
+	$(CORE_LIBS) $(IMAGE_LIBS) $(FRIBIDI_LIBS)
 icewmbg_OBJS = \
 	icewmbg.o $(libice_OBJS)
 
@@ -116,7 +118,7 @@
 	gnome2.o misc.o ycmdline.o yarray.o
 
 icehelp_LIBS = \
-	$(CORE_LIBS) $(IMAGE_LIBS)
+	$(CORE_LIBS) $(IMAGE_LIBS) $(FRIBIDI_LIBS)
 icehelp_OBJS = \
 	$(libitk_OBJS) $(libice_OBJS) icehelp.o
 
@@ -132,7 +134,7 @@
 icewmtray_OBJS = \
 	$(libitk_OBJS) $(libice_OBJS) yxtray.o icetray.o
 icewmtray_LIBS = \
-	$(CORE_LIBS) $(IMAGE_LIBS)
+	$(CORE_LIBS) $(IMAGE_LIBS) $(FRIBIDI_LIBS)
 icesame_OBJS = \
 	$(libitk_OBJS) $(libice_OBJS) icesame.o
 icesame_LIBS = \