diff --git a/fixincludes/ChangeLog b/fixincludes/ChangeLog
index 3c0520b2d1a45..827585f15dac0 100644
--- a/fixincludes/ChangeLog
+++ b/fixincludes/ChangeLog
@@ -1,3 +1,10 @@
+2015-03-28  John David Anglin  <danglin@gcc.gnu.org>
+
+	PR libstdc++/65500
+	* inclhack.def (hpux11_lwp_rwlock_valid): New fix.
+	* fixincl.x: Regenerate.
+	* tests/base/sys/pthread.h [HPUX11_LWP_RWLOCK_VALID_CHECK]: New test.
+
 2015-02-16  Daniel Richard G.  <skunk@iskunk.org>
 
 	PR bootstrap/48009
diff --git a/fixincludes/fixincl.x b/fixincludes/fixincl.x
index 77b8f77aa9928..68bb9a8347b5f 100644
--- a/fixincludes/fixincl.x
+++ b/fixincludes/fixincl.x
@@ -2,11 +2,11 @@
  * 
  * DO NOT EDIT THIS FILE   (fixincl.x)
  * 
- * It has been AutoGen-ed  February 15, 2015 at 12:33:10 PM by AutoGen 5.12
+ * It has been AutoGen-ed  Saturday March 28, 2015 at 01:24:12 PM EDT
  * From the definitions    inclhack.def
  * and the template file   fixincl
  */
-/* DO NOT SVN-MERGE THIS FILE, EITHER Sun Feb 15 12:33:10 PST 2015
+/* DO NOT SVN-MERGE THIS FILE, EITHER Sat 28 Mar 2015 13:24:12 EDT
  *
  * You must regenerate it.  Use the ./genfixes script.
  *
@@ -15,7 +15,7 @@
  * certain ANSI-incompatible system header files which are fixed to work
  * correctly with ANSI C and placed in a directory that GNU C will search.
  *
- * This file contains 225 fixup descriptions.
+ * This file contains 226 fixup descriptions.
  *
  * See README for more information.
  *
@@ -3852,6 +3852,43 @@ static const char* apzHpux11_AbsPatch[] = {
     "if !defined(_MATH_INCLUDED) || defined(__GNUG__)",
     (char*)NULL };
 
+/* * * * * * * * * * * * * * * * * * * * * * * * * *
+ *
+ *  Description of Hpux11_Lwp_Rwlock_Valid fix
+ */
+tSCC zHpux11_Lwp_Rwlock_ValidName[] =
+     "hpux11_lwp_rwlock_valid";
+
+/*
+ *  File name selection pattern
+ */
+tSCC zHpux11_Lwp_Rwlock_ValidList[] =
+  "sys/pthread.h\0";
+/*
+ *  Machine/OS name selection pattern
+ */
+tSCC* apzHpux11_Lwp_Rwlock_ValidMachs[] = {
+        "*-hp-hpux11*",
+        (const char*)NULL };
+
+/*
+ *  content selection pattern - do fix if pattern found
+ */
+tSCC zHpux11_Lwp_Rwlock_ValidSelect0[] =
+       "#define __LWP_RWLOCK_VALID[ \t]*0x8c91";
+
+#define    HPUX11_LWP_RWLOCK_VALID_TEST_CT  1
+static tTestDesc aHpux11_Lwp_Rwlock_ValidTests[] = {
+  { TT_EGREP,    zHpux11_Lwp_Rwlock_ValidSelect0, (regex_t*)NULL }, };
+
+/*
+ *  Fix Command Arguments for Hpux11_Lwp_Rwlock_Valid
+ */
+static const char* apzHpux11_Lwp_Rwlock_ValidPatch[] = {
+    "format",
+    "#define __LWP_RWLOCK_VALID              -29551",
+    (char*)NULL };
+
 /* * * * * * * * * * * * * * * * * * * * * * * * * *
  *
  *  Description of Hpux11_Extern_Sendfile fix
@@ -9241,9 +9278,9 @@ static const char* apzX11_SprintfPatch[] = {
  *
  *  List of all fixes
  */
-#define REGEX_COUNT          262
+#define REGEX_COUNT          263
 #define MACH_LIST_SIZE_LIMIT 187
-#define FIX_COUNT            225
+#define FIX_COUNT            226
 
 /*
  *  Enumerate the fixes
@@ -9337,6 +9374,7 @@ typedef enum {
     HPUX10_CTYPE_DECLARATIONS2_FIXIDX,
     HPUX10_STDIO_DECLARATIONS_FIXIDX,
     HPUX11_ABS_FIXIDX,
+    HPUX11_LWP_RWLOCK_VALID_FIXIDX,
     HPUX11_EXTERN_SENDFILE_FIXIDX,
     HPUX11_EXTERN_SENDPATH_FIXIDX,
     HPUX11_FABSF_FIXIDX,
@@ -9917,6 +9955,11 @@ tFixDesc fixDescList[ FIX_COUNT ] = {
      HPUX11_ABS_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
      aHpux11_AbsTests,   apzHpux11_AbsPatch, 0 },
 
+  {  zHpux11_Lwp_Rwlock_ValidName,    zHpux11_Lwp_Rwlock_ValidList,
+     apzHpux11_Lwp_Rwlock_ValidMachs,
+     HPUX11_LWP_RWLOCK_VALID_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
+     aHpux11_Lwp_Rwlock_ValidTests,   apzHpux11_Lwp_Rwlock_ValidPatch, 0 },
+
   {  zHpux11_Extern_SendfileName,    zHpux11_Extern_SendfileList,
      apzHpux11_Extern_SendfileMachs,
      HPUX11_EXTERN_SENDFILE_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
diff --git a/fixincludes/inclhack.def b/fixincludes/inclhack.def
index 5e906f4c1ac3c..314e283c533f4 100644
--- a/fixincludes/inclhack.def
+++ b/fixincludes/inclhack.def
@@ -2073,6 +2073,19 @@ fix = {
     test_text = "#ifndef _MATH_INCLUDED";
 };
 
+/*
+ *  Fix hpux11 __LWP_RWLOCK_VALID define
+ */
+fix = {
+    hackname  = hpux11_lwp_rwlock_valid;
+    mach      = "*-hp-hpux11*";
+    files     = sys/pthread.h;
+    select    = "#define __LWP_RWLOCK_VALID[ \t]*0x8c91";
+    c_fix     = format;
+    c_fix_arg = "#define __LWP_RWLOCK_VALID              -29551";
+    test_text = "#define __LWP_RWLOCK_VALID 0x8c91";
+};
+
 /*
  * hpux sendfile()
  */
diff --git a/fixincludes/tests/base/sys/pthread.h b/fixincludes/tests/base/sys/pthread.h
index 8b893cfe55f37..36f656eb6a615 100644
--- a/fixincludes/tests/base/sys/pthread.h
+++ b/fixincludes/tests/base/sys/pthread.h
@@ -9,6 +9,11 @@
 
 
 
+#if defined( HPUX11_LWP_RWLOCK_VALID_CHECK )
+#define __LWP_RWLOCK_VALID              -29551
+#endif  /* HPUX11_LWP_RWLOCK_VALID_CHECK */
+
+
 #if defined( HPUX11_PTHREAD_CONST_CHECK )
 #define __POINTER_SET		((void *) 1L)
 #endif  /* HPUX11_PTHREAD_CONST_CHECK */