diff --git a/misc/buildroot/ChangeLog b/misc/buildroot/ChangeLog
index 72c6ac29bf..3cfd60bf2e 100644
--- a/misc/buildroot/ChangeLog
+++ b/misc/buildroot/ChangeLog
@@ -121,4 +121,6 @@ buildroot-1.11 2011-xx-xx <gnutt@nuttx.org>
 	* Added an ARM EABI GCC 4.6.3 configuration (tool name is arm-nuttx-eabi-).
 	* ldnxflat: Add support for the R_ARM_REL32 relocation.  This relocation
 	  type was not generated by GCC/LD prior to gcc-4.6.3
+	* R_ARM_REL32 logic is conditionally disabled because it has not been
+	  tested.
 
diff --git a/misc/buildroot/toolchain/nxflat/ldnxflat.c b/misc/buildroot/toolchain/nxflat/ldnxflat.c
index 5bcdc5da0e..5343e6b438 100644
--- a/misc/buildroot/toolchain/nxflat/ldnxflat.c
+++ b/misc/buildroot/toolchain/nxflat/ldnxflat.c
@@ -1118,7 +1118,14 @@ resolve_segment_relocs(bfd *input_bfd, segment_info *inf, asymbol **syms)
                  * the symbol value is relative to the PC, and (2) we cannot permit
                  * REL32 relocations to data in I-Space.  That just would not make sense.
                  */
+#if 1
+                /* The logic below may or may not be correct.  It has not been verified
+                 * so, for now, it is disabled.
+                 */
 
+                err("REL32 relocation not yet supported\n");
+                nerrors++;
+#else
                 switch (get_reloc_type(rel_section, NULL))
                   {
                     case NXFLAT_RELOC_TARGET_UNKNOWN:
@@ -1145,6 +1152,7 @@ resolve_segment_relocs(bfd *input_bfd, segment_info *inf, asymbol **syms)
                       }
                       break;
                   }
+#endif
               }
               break;