diff --git a/modules/ripple_data/protocol/ripple_SerializeDeclarations.h b/modules/ripple_data/protocol/ripple_SerializeDeclarations.h
index 6c65089aed..73274734bb 100644
--- a/modules/ripple_data/protocol/ripple_SerializeDeclarations.h
+++ b/modules/ripple_data/protocol/ripple_SerializeDeclarations.h
@@ -79,6 +79,8 @@ FIELD (OperationLimit,       UINT32, 29)
 FIELD (ReferenceFeeUnits,    UINT32, 30)
 FIELD (ReserveBase,          UINT32, 31)
 FIELD (ReserveIncrement,     UINT32, 32)
+FIELD (SetFlag,              UINT32, 33)
+FIELD (ClearFlag,            UINT32, 34)
 
 // 64-bit integers
 FIELD (IndexNext,            UINT64, 1)
diff --git a/modules/ripple_data/protocol/ripple_TxFlags.h b/modules/ripple_data/protocol/ripple_TxFlags.h
index ca43384435..5a8fee2207 100644
--- a/modules/ripple_data/protocol/ripple_TxFlags.h
+++ b/modules/ripple_data/protocol/ripple_TxFlags.h
@@ -33,12 +33,9 @@ const uint32 tfRequireAuth          = 0x00040000;
 const uint32 tfOptionalAuth         = 0x00080000;
 const uint32 tfDisallowXRP          = 0x00100000;
 const uint32 tfAllowXRP             = 0x00200000;
-const uint32 tfDisableMaster        = 0x00400000;
-const uint32 tfEnableMaster         = 0x00800000;
 const uint32 tfAccountSetMask       = ~ (TxFlag::requireDestTag | tfOptionalDestTag
                                       | tfRequireAuth | tfOptionalAuth
-                                      | tfDisallowXRP | tfAllowXRP
-                                      | tfDisableMaster | tfEnableMaster);
+                                      | tfDisallowXRP | tfAllowXRP);
 
 // OfferCreate flags:
 const uint32 tfPassive              = 0x00010000;
diff --git a/modules/ripple_data/protocol/ripple_TxFormat.cpp b/modules/ripple_data/protocol/ripple_TxFormat.cpp
index 98e15ad46f..49eee8679b 100644
--- a/modules/ripple_data/protocol/ripple_TxFormat.cpp
+++ b/modules/ripple_data/protocol/ripple_TxFormat.cpp
@@ -31,6 +31,8 @@ void TFInit ()
             << SOElement (sfMessageKey,      SOE_OPTIONAL)
             << SOElement (sfDomain,          SOE_OPTIONAL)
             << SOElement (sfTransferRate,    SOE_OPTIONAL)
+            << SOElement (sfSetFlag,         SOE_OPTIONAL)
+            << SOElement (sfClearFlag,       SOE_OPTIONAL)
             ;
 
     DECLARE_TF (TrustSet, ttTRUST_SET)