diff --git a/sql/ha_ndbcluster.cc b/sql/ha_ndbcluster.cc
index e26622422cdf9c7abbe65950434aaddb88f491fd..bbed637e5b18be0f607a61975df0ff554067e24c 100644
--- a/sql/ha_ndbcluster.cc
+++ b/sql/ha_ndbcluster.cc
@@ -564,6 +564,13 @@ int ha_ndbcluster::set_ndb_value(NdbOperation *ndb_op, Field *field,
           DBUG_RETURN((ndb_op->setValue(fieldnr, (char*)NULL, pack_len) != 0));
         DBUG_PRINT("info", ("bit field"));
         DBUG_DUMP("value", (char*)&bits, pack_len);
+#ifdef WORDS_BIGENDIAN
+	if (pack_len < 5)
+	{
+	  DBUG_RETURN(ndb_op->setValue(fieldnr, 
+				       ((char*)&bits)+4, pack_len) != 0);
+	}
+#endif
 	DBUG_RETURN(ndb_op->setValue(fieldnr, (char*)&bits, pack_len) != 0);
       }
     }
@@ -3947,7 +3954,7 @@ ha_ndbcluster::ha_ndbcluster(TABLE *table_arg):
 		HA_AUTO_PART_KEY |
 		HA_NO_PREFIX_CHAR_KEYS |
 		HA_NEED_READ_RANGE_BUFFER |
-                                HA_CAN_BIT_FIELD),
+		HA_CAN_BIT_FIELD),
   m_share(0),
   m_use_write(FALSE),
   m_ignore_dup_key(FALSE),