diff --git a/src/font/font_settings.hpp b/src/font/font_settings.hpp
index 3dc183584..cae11caf8 100644
--- a/src/font/font_settings.hpp
+++ b/src/font/font_settings.hpp
@@ -35,6 +35,11 @@ private:
     /** True if black border will be drawn when rendering. */
     bool m_black_border;
 
+    /** True if a custom colored border will be drawn when rendering.
+      * If both a black border and a colored border are set to be used,
+      * the colored border will take priority. */
+    bool m_colored_border;
+
     /** If true, characters will have right alignment when rendering, for RTL
      *  language. */
     bool m_rtl;
@@ -48,20 +53,26 @@ private:
     /** Save the color of shadow when rendering. */
     video::SColor m_shadow_color;
 
+    /** Used when m_colored_border is true */
+    video::SColor m_border_color;
+
 public:
     LEAK_CHECK()
     // ------------------------------------------------------------------------
     /** Constructor. It will initialize all members with default values if no
      *  parameter is given. */
-    FontSettings(bool black_border = false, bool rtl = false,
-                 float scale = 1.0f, bool shadow = false,
-                 const video::SColor& color = video::SColor(0, 0, 0, 0))
+    FontSettings(bool black_border = false, bool colored_border = false,
+                 bool rtl = false, float scale = 1.0f, bool shadow = false,
+                 const video::SColor& shadow_color = video::SColor(0, 0, 0, 0),
+                 const video::SColor& border_color = video::SColor(0, 0, 0, 0))
     {
         m_black_border = black_border;
+        m_colored_border = colored_border;
         m_rtl = rtl;
         m_scale = scale;
         m_shadow = shadow;
-        m_shadow_color = color;
+        m_shadow_color = shadow_color;
+        m_border_color = border_color;
     }
     // ------------------------------------------------------------------------
     /** Set the scaling.
@@ -89,9 +100,23 @@ public:
      *  \param border If it's enabled. */
     void setBlackBorder(bool border)               { m_black_border = border; }
     // ------------------------------------------------------------------------
+    /** Set whether a custom colored border is enabled.
+     *  \param border If it's enabled. */
+    void setColoredBorder(bool border )          { m_colored_border = border; }
+    // ------------------------------------------------------------------------
+    /** Set the color of border (used when a non-black border is requested).
+     *  \param col The color of border to be set. */
+    void setBorderColor(const video::SColor &col)     { m_border_color = col; }
+    // ------------------------------------------------------------------------
+    /** Return the color of the border.. */
+    const video::SColor& getBorderColor() const      { return m_border_color; }
+    // ------------------------------------------------------------------------
     /** Return if black border is enabled. */
     bool useBlackBorder() const                      { return m_black_border; }
     // ------------------------------------------------------------------------
+    /** Return if black border is enabled. */
+    bool useColoredBorder() const                  { return m_colored_border; }
+    // ------------------------------------------------------------------------
     /** Set right text alignment for RTL language.
      *  \param rtl If it's enabled. */
     void setRTL(bool rtl)                                      { m_rtl = rtl; }
diff --git a/src/font/font_with_face.cpp b/src/font/font_with_face.cpp
index e7f6aa983..bdb484d2a 100644
--- a/src/font/font_with_face.cpp
+++ b/src/font/font_with_face.cpp
@@ -516,6 +516,8 @@ void FontWithFace::render(const core::stringw& text,
 
     const bool black_border = font_settings ?
         font_settings->useBlackBorder() : false;
+    const bool colored_border = font_settings ?
+        font_settings->useColoredBorder() : false;
     const bool rtl = font_settings ? font_settings->isRTL() : false;
     const float scale = font_settings ? font_settings->getScale() : 1.0f;
     const float shadow = font_settings ? font_settings->useShadow() : false;
@@ -639,11 +641,14 @@ void FontWithFace::render(const core::stringw& text,
 
     const int sprite_amount = sprites.size();
 
-    if ((black_border || isBold()) && char_collector == NULL)
+    if ((black_border || colored_border || isBold()) && char_collector == NULL)
     {
         // Draw black border first, to make it behind the real character
         // which make script language display better
+        video::SColor custom_color = font_settings->getBorderColor();
         video::SColor black(color.getAlpha(),0,0,0);
+        video::SColor border_color = (colored_border) ? custom_color : black;
+
         for (int n = 0; n < indice_amount; n++)
         {
             const int sprite_id = indices[n];
@@ -678,7 +683,7 @@ void FontWithFace::render(const core::stringw& text,
                     if (x_delta == 0 || y_delta == 0) continue;
                     draw2DImage(texture, dest + core::position2d<float>
                         (float(x_delta), float(y_delta)), source, clip,
-                        black, true);
+                        border_color, true);
                 }
             }
         }