diff --git a/winsup/w32api/ChangeLog b/winsup/w32api/ChangeLog
index 367190bdd..96482eaa0 100644
--- a/winsup/w32api/ChangeLog
+++ b/winsup/w32api/ChangeLog
@@ -1,3 +1,13 @@
+2011-12-22  Corinna Vinschen  <corinna@vinschen.de>
+
+	* include/winnt.h (JOB_OBJECT_LIMIT_BREAKAWAY_OK): Define.
+	(JOB_OBJECT_LIMIT_SILENT_BREAKAWAY_OK): Define.
+	(JOB_OBJECT_BREAKAWAY_OK): Define as JOB_OBJECT_LIMIT_BREAKAWAY_OK
+	and mark as kept for backward compatibility only.
+	(JOB_OBJECT_SILENT_BREAKAWAY): Define as
+	JOB_OBJECT_LIMIT_SILENT_BREAKAWAY_OK and mark as kept for backward
+	compatibility only.
+
 2011-12-22  Corinna Vinschen  <corinna@vinschen.de>
 
 	* include/winnt.h: Add missing PROCESS_QUERY_LIMITED_INFORMATION.
diff --git a/winsup/w32api/include/winnt.h b/winsup/w32api/include/winnt.h
index a556ef0c3..b31274bbe 100644
--- a/winsup/w32api/include/winnt.h
+++ b/winsup/w32api/include/winnt.h
@@ -3503,8 +3503,12 @@ typedef union _FILE_SEGMENT_ELEMENT {
 #define JOB_OBJECT_LIMIT_PROCESS_MEMORY             0x0100
 #define JOB_OBJECT_LIMIT_JOB_MEMORY                 0x0200
 #define JOB_OBJECT_LIMIT_DIE_ON_UNHANDLED_EXCEPTION 0x0400
-#define JOB_OBJECT_BREAKAWAY_OK                     0x0800
-#define JOB_OBJECT_SILENT_BREAKAWAY                 0x1000
+#define JOB_OBJECT_LIMIT_BREAKAWAY_OK               0x0800
+#define JOB_OBJECT_LIMIT_SILENT_BREAKAWAY_OK        0x1000
+
+/* Wrong definitions, but keep for backward compatibility. */
+#define JOB_OBJECT_BREAKAWAY_OK      JOB_OBJECT_LIMIT_BREAKAWAY_OK
+#define JOB_OBJECT_SILENT_BREAKAWAY  JOB_OBJECT_LIMIT_SILENT_BREAKAWAY_OK
 
 /* JOBOBJECT_BASIC_UI_RESTRICTIONS.UIRestrictionsClass constants */
 #define JOB_OBJECT_UILIMIT_HANDLES          0x0001