diff --git a/docs/changes.txt b/docs/changes.txt
index 1e438a84f8..8634e40ad0 100644
--- a/docs/changes.txt
+++ b/docs/changes.txt
@@ -128,6 +128,8 @@ wxGTK:
 - Fix wxNO_BORDER style for wxRadioBox (David Hart)
 - wxComboBox::SetValue() doesn't emit EVT_TEXT anymore
 - Fix wxTextCtrl::GetLineText() for empty lines (Marcin Wojdyr)
+- Support wxTEXT_ALIGNMENT_JUSTIFIED in wxTextCtrl if GTK+ version is at
+  least 2.11 (Mart Raudsepp).
 
 wxMac:
 
diff --git a/src/gtk/textctrl.cpp b/src/gtk/textctrl.cpp
index f17fa1ff1a..0201fefb9a 100644
--- a/src/gtk/textctrl.cpp
+++ b/src/gtk/textctrl.cpp
@@ -144,7 +144,16 @@ static void wxGtkTextApplyTagsFromAttr(GtkWidget *text,
             case wxTEXT_ALIGNMENT_CENTER:
                 align = GTK_JUSTIFY_CENTER;
                 break;
-            // gtk+ doesn't support justify as of gtk+-2.7.4
+// gtk+ doesn't support justify before gtk+-2.11.0 with pango-1.17 being available
+// (but if new enough pango isn't available it's a mere gtk warning)
+#if GTK_CHECK_VERSION(2,11,0)
+            case wxTEXT_ALIGNMENT_JUSTIFIED:
+                if (!gtk_check_version(2,11,0))
+                    align = GTK_JUSTIFY_FILL;
+                else
+                    align = GTK_JUSTIFY_LEFT;
+                break;
+#endif
         }
 
         g_snprintf(buf, sizeof(buf), "WXALIGNMENT %d", align);