diff --git a/encoding/textpb/encode.go b/encoding/textpb/encode.go
new file mode 100644
index 0000000..1b11e66
--- /dev/null
+++ b/encoding/textpb/encode.go
@@ -0,0 +1,250 @@
+// Copyright 2018 The Go Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+package textpb
+
+import (
+	"sort"
+
+	"github.com/golang/protobuf/v2/internal/encoding/text"
+	"github.com/golang/protobuf/v2/internal/errors"
+	"github.com/golang/protobuf/v2/internal/pragma"
+	"github.com/golang/protobuf/v2/proto"
+	pref "github.com/golang/protobuf/v2/reflect/protoreflect"
+)
+
+// Marshal marshals a proto.Message in text format using default options.
+// TODO: may want to describe when Marshal returns error.
+func Marshal(m proto.Message) ([]byte, error) {
+	return MarshalOptions{}.Marshal(m)
+}
+
+// MarshalOptions is a configurable text format marshaler.
+type MarshalOptions struct {
+	pragma.NoUnkeyedLiterals
+
+	// Set Compact to true to have output in a single line with no line breaks.
+	Compact bool
+}
+
+// Marshal returns the given proto.Message in text format using options in MarshalOptions object.
+func (o MarshalOptions) Marshal(m proto.Message) ([]byte, error) {
+	var nerr errors.NonFatal
+	var v text.Value
+
+	if m == nil {
+		// TODO: Make sure this is consistent with jsonpb and binary serialization.
+		v = text.ValueOf([][2]text.Value{})
+	} else {
+		var err error
+		v, err = o.marshalMessage(m.ProtoReflect())
+		if !nerr.Merge(err) {
+			return nil, err
+		}
+	}
+
+	indent := "  "
+	if o.Compact {
+		indent = ""
+	}
+	delims := [2]byte{'{', '}'}
+
+	const outputASCII = false
+	b, err := text.Marshal(v, indent, delims, outputASCII)
+	if !nerr.Merge(err) {
+		return nil, err
+	}
+	return b, nerr.E
+}
+
+// marshalMessage converts a protoreflect.Message to a text.Value.
+func (o MarshalOptions) marshalMessage(m pref.Message) (text.Value, error) {
+	var nerr errors.NonFatal
+	var msgFields [][2]text.Value
+
+	// Handle known fields.
+	msgType := m.Type()
+	fieldDescs := msgType.Fields()
+	knownFields := m.KnownFields()
+	size := fieldDescs.Len()
+	for i := 0; i < size; i++ {
+		fieldDesc := fieldDescs.Get(i)
+		fieldNum := fieldDesc.Number()
+
+		if !knownFields.Has(fieldNum) {
+			if fieldDesc.Cardinality() == pref.Required {
+				// Treat unset required fields as a non-fatal error.
+				nerr.AppendRequiredNotSet(string(fieldDesc.FullName()))
+			}
+			continue
+		}
+
+		txtName := text.ValueOf(fieldDesc.Name())
+		value := knownFields.Get(fieldNum)
+
+		if fieldDesc.Cardinality() == pref.Repeated {
+			// Map or repeated fields.
+			var items []text.Value
+			var err error
+			if fieldDesc.IsMap() {
+				items, err = o.marshalMap(value.Map(), fieldDesc)
+				if !nerr.Merge(err) {
+					return text.Value{}, err
+				}
+			} else {
+				items, err = o.marshalList(value.List(), fieldDesc)
+				if !nerr.Merge(err) {
+					return text.Value{}, err
+				}
+			}
+
+			// Add each item as key: value field.
+			for _, item := range items {
+				msgFields = append(msgFields, [2]text.Value{txtName, item})
+			}
+		} else {
+			// Required or optional fields.
+			txtValue, err := o.marshalSingular(value, fieldDesc)
+			if !nerr.Merge(err) {
+				return text.Value{}, err
+			}
+			msgFields = append(msgFields, [2]text.Value{txtName, txtValue})
+		}
+
+	}
+
+	// TODO: Handle extensions, unknowns and Any.
+
+	return text.ValueOf(msgFields), nerr.E
+}
+
+// marshalSingular converts a non-repeated field value to text.Value.
+// This includes all scalar types, enums, messages, and groups.
+func (o MarshalOptions) marshalSingular(val pref.Value, fd pref.FieldDescriptor) (text.Value, error) {
+	kind := fd.Kind()
+	switch kind {
+	case pref.BoolKind,
+		pref.Int32Kind, pref.Sint32Kind, pref.Uint32Kind,
+		pref.Int64Kind, pref.Sint64Kind, pref.Uint64Kind,
+		pref.Sfixed32Kind, pref.Fixed32Kind,
+		pref.Sfixed64Kind, pref.Fixed64Kind,
+		pref.FloatKind, pref.DoubleKind,
+		pref.StringKind, pref.BytesKind:
+		return text.ValueOf(val.Interface()), nil
+
+	case pref.EnumKind:
+		num := val.Enum()
+		if desc := fd.EnumType().Values().ByNumber(num); desc != nil {
+			return text.ValueOf(desc.Name()), nil
+		}
+		// Use numeric value if there is no enum description.
+		return text.ValueOf(int32(num)), nil
+
+	case pref.MessageKind, pref.GroupKind:
+		return o.marshalMessage(val.Message())
+	}
+
+	return text.Value{}, errors.New("%v has unknown kind: %v", fd.FullName(), kind)
+}
+
+// marshalList converts a protoreflect.List to []text.Value.
+func (o MarshalOptions) marshalList(list pref.List, fd pref.FieldDescriptor) ([]text.Value, error) {
+	var nerr errors.NonFatal
+	size := list.Len()
+	values := make([]text.Value, 0, size)
+
+	for i := 0; i < size; i++ {
+		item := list.Get(i)
+		val, err := o.marshalSingular(item, fd)
+		if !nerr.Merge(err) {
+			// Return already marshaled values.
+			return values, err
+		}
+		values = append(values, val)
+	}
+
+	return values, nerr.E
+}
+
+var (
+	mapKeyName   = text.ValueOf(pref.Name("key"))
+	mapValueName = text.ValueOf(pref.Name("value"))
+)
+
+// marshalMap converts a protoreflect.Map to []text.Value.
+func (o MarshalOptions) marshalMap(mmap pref.Map, fd pref.FieldDescriptor) ([]text.Value, error) {
+	var nerr errors.NonFatal
+	// values is a list of messages.
+	values := make([]text.Value, 0, mmap.Len())
+	msgFields := fd.MessageType().Fields()
+	keyType := msgFields.ByNumber(1)
+	valType := msgFields.ByNumber(2)
+
+	mmap.Range(func(key pref.MapKey, val pref.Value) bool {
+		keyTxtVal, err := o.marshalSingular(key.Value(), keyType)
+		if !nerr.Merge(err) {
+			return false
+		}
+		valTxtVal, err := o.marshalSingular(val, valType)
+		if !nerr.Merge(err) {
+			return false
+		}
+		// Map entry (message) contains 2 fields, first field for key and second field for value.
+		msg := text.ValueOf([][2]text.Value{
+			{mapKeyName, keyTxtVal},
+			{mapValueName, valTxtVal},
+		})
+		values = append(values, msg)
+		return true
+	})
+
+	sortMap(keyType.Kind(), values)
+	return values, nerr.E
+}
+
+// sortMap orders list based on value of key field for deterministic output.
+// TODO: Improve sort comparison of text.Value for map keys.
+func sortMap(keyKind pref.Kind, values []text.Value) {
+	less := func(i, j int) bool {
+		mi := values[i].Message()
+		mj := values[j].Message()
+		return mi[0][1].String() < mj[0][1].String()
+	}
+	switch keyKind {
+	case pref.Int32Kind, pref.Sint32Kind, pref.Sfixed32Kind:
+		less = func(i, j int) bool {
+			mi := values[i].Message()
+			mj := values[j].Message()
+			ni, _ := mi[0][1].Int(false)
+			nj, _ := mj[0][1].Int(false)
+			return ni < nj
+		}
+	case pref.Int64Kind, pref.Sint64Kind, pref.Sfixed64Kind:
+		less = func(i, j int) bool {
+			mi := values[i].Message()
+			mj := values[j].Message()
+			ni, _ := mi[0][1].Int(true)
+			nj, _ := mj[0][1].Int(true)
+			return ni < nj
+		}
+
+	case pref.Uint32Kind, pref.Fixed32Kind:
+		less = func(i, j int) bool {
+			mi := values[i].Message()
+			mj := values[j].Message()
+			ni, _ := mi[0][1].Uint(false)
+			nj, _ := mj[0][1].Uint(false)
+			return ni < nj
+		}
+	case pref.Uint64Kind, pref.Fixed64Kind:
+		less = func(i, j int) bool {
+			mi := values[i].Message()
+			mj := values[j].Message()
+			ni, _ := mi[0][1].Uint(true)
+			nj, _ := mj[0][1].Uint(true)
+			return ni < nj
+		}
+	}
+	sort.Slice(values, less)
+}