diff --git a/src/library/tactic/proof_state.cpp b/src/library/tactic/proof_state.cpp
index 39df38241..e5458720c 100644
--- a/src/library/tactic/proof_state.cpp
+++ b/src/library/tactic/proof_state.cpp
@@ -9,7 +9,17 @@ Author: Leonardo de Moura
 #include "library/kernel_bindings.h"
 #include "library/tactic/proof_state.h"
 
+#ifndef LEAN_PROOF_STATE_GOAL_NAMES
+#define LEAN_PROOF_STATE_GOAL_NAMES false
+#endif
+
 namespace lean {
+static name g_proof_state_goal_names       {"tactic", "proof_state", "goal_names"};
+RegisterBoolOption(g_proof_state_goal_names, LEAN_PROOF_STATE_GOAL_NAMES, "(tactic) display goal names when pretty printing proof state");
+bool get_proof_state_goal_names(options const & opts) {
+    return opts.get_bool(g_proof_state_goal_names, LEAN_PROOF_STATE_GOAL_NAMES);
+}
+
 optional<name> get_ith_goal_name(goals const & gs, unsigned i) {
     unsigned j = 1;
     for (auto const & p : gs) {
@@ -36,6 +46,8 @@ bool trust_cex(precision p) {
 }
 
 format proof_state::pp(formatter const & fmt, options const & opts) const {
+    bool show_goal_names = get_proof_state_goal_names(opts);
+    unsigned indent      = get_pp_indent(opts);
     format r;
     bool first = true;
     for (auto const & p : get_goals()) {
@@ -43,7 +55,11 @@ format proof_state::pp(formatter const & fmt, options const & opts) const {
             first = false;
         else
             r += line();
-        r += p.second.pp(fmt, opts);
+        if (show_goal_names) {
+            r += group(format{format(p.first), colon(), nest(indent, compose(line(), p.second.pp(fmt, opts)))});
+        } else {
+            r += p.second.pp(fmt, opts);
+        }
     }
     if (first) {
         r = format("no goals");
diff --git a/tests/lean/interactive/t8.lean b/tests/lean/interactive/t8.lean
new file mode 100644
index 000000000..76fd33d14
--- /dev/null
+++ b/tests/lean/interactive/t8.lean
@@ -0,0 +1,6 @@
+Set tactic::proof_state::goal_names true.
+Theorem T (a : Bool) : a => a /\ a.
+   apply imp_tac.
+   apply Conj.
+   assumption.
+   done.
diff --git a/tests/lean/interactive/t8.lean.expected.out b/tests/lean/interactive/t8.lean.expected.out
new file mode 100644
index 000000000..0faa67bd3
--- /dev/null
+++ b/tests/lean/interactive/t8.lean.expected.out
@@ -0,0 +1,15 @@
+Type Ctrl-D or 'Exit.' to exit or 'Help.' for help.
+#   Set: pp::colors
+  Set: pp::unicode
+  Set: tactic::proof_state::goal_names
+# Proof state:
+main: a : Bool ⊢ a ⇒ a ∧ a
+## Proof state:
+main: H : a, a : Bool ⊢ a ∧ a
+## Proof state:
+main::1: H : a, a : Bool ⊢ a
+main::2: H : a, a : Bool ⊢ a
+## Proof state:
+no goals
+##   Proved: T
+# 
\ No newline at end of file