diff --git a/CHANGELOG.md b/CHANGELOG.md
index 44db318bf..6937eaeb4 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -12,6 +12,7 @@ BREAKING CHANGES:
 FEATURES:
  - [types] added Tags field to ResponseDeliverTx
  - [types] added Gas and Fee fields to ResponseCheckTx
+ - [dummy] DeliverTx returns tags
 
 ## 0.7.1 (November 14, 2017)
 
diff --git a/example/dummy/dummy.go b/example/dummy/dummy.go
index 65d524cfe..30eaff284 100644
--- a/example/dummy/dummy.go
+++ b/example/dummy/dummy.go
@@ -1,8 +1,8 @@
 package dummy
 
 import (
+	"bytes"
 	"fmt"
-	"strings"
 
 	"github.com/tendermint/abci/types"
 	wire "github.com/tendermint/go-wire"
@@ -29,13 +29,20 @@ func (app *DummyApplication) Info(req types.RequestInfo) (resInfo types.Response
 
 // tx is either "key=value" or just arbitrary bytes
 func (app *DummyApplication) DeliverTx(tx []byte) types.ResponseDeliverTx {
-	parts := strings.Split(string(tx), "=")
+	var key, value []byte
+	parts := bytes.Split(tx, []byte("="))
 	if len(parts) == 2 {
-		app.state.Set([]byte(parts[0]), []byte(parts[1]))
+		key, value = parts[0], parts[1]
 	} else {
-		app.state.Set(tx, tx)
+		key, value = tx, tx
 	}
-	return types.ResponseDeliverTx{Code: types.CodeType_OK}
+	app.state.Set(key, value)
+
+	tags := []*types.KVPair{
+		{Key: "app.creator", ValueType: types.KVPair_STRING, ValueString: "jae"},
+		{Key: "app.key", ValueType: types.KVPair_STRING, ValueString: string(key)},
+	}
+	return types.ResponseDeliverTx{Code: types.CodeType_OK, Tags: tags}
 }
 
 func (app *DummyApplication) CheckTx(tx []byte) types.ResponseCheckTx {