diff --git a/.appveyor.yml b/.appveyor.yml
index c92d57a67..fb47210f9 100644
--- a/.appveyor.yml
+++ b/.appveyor.yml
@@ -1,4 +1,4 @@
-version: 0.2.5.{build}
+version: 0.2.6.{build}
 os: Windows Server 2012 R2
 install:
 - C:\Python34\Scripts\pip install ply pyreadline nose prompt_toolkit
diff --git a/CHANGELOG.rst b/CHANGELOG.rst
index c1746bbdc..42c4c1dfa 100644
--- a/CHANGELOG.rst
+++ b/CHANGELOG.rst
@@ -4,6 +4,20 @@ Xonsh Change Log
 
 Current Developments
 ====================
+**Added:** None
+
+**Changed:** None
+
+**Deprecated:** None
+
+**Removed:** None
+
+**Fixed:** None
+
+**Security:** None
+
+v0.2.6
+====================
 **Added:** 
 
 * ``trace`` alias added that enables users to turn on and off the printing 
@@ -29,10 +43,6 @@ Current Developments
   now default to ``None``.
 * Updated alias docs to pull in usage from the commands automatically.
 
-**Deprecated:** None
-
-**Removed:** None
-
 **Fixed:**
 
 * Hundreds of bugs related to line and column numbers have been addressed.
@@ -42,8 +52,6 @@ Current Developments
 * Worked around bug in ConEmu/cmder which prevented ``get_git_branch()`` 
   from working in these terminal emulators on Windows.
 
-**Security:** None
-
 
 v0.2.5
 ===========
diff --git a/xonsh/__init__.py b/xonsh/__init__.py
index 13a85f774..44b18069b 100644
--- a/xonsh/__init__.py
+++ b/xonsh/__init__.py
@@ -1 +1 @@
-__version__ = '0.2.5'
+__version__ = '0.2.6'
diff --git a/xonsh/tracer.py b/xonsh/tracer.py
index cf9abb424..5290364a2 100644
--- a/xonsh/tracer.py
+++ b/xonsh/tracer.py
@@ -109,6 +109,7 @@ def format_line(fname, lineno, line, color=True, lexer=None, formatter=None):
         lexer = lexer or pyghooks.XonshLexer()
         formatter = formatter or pygments.formatters.terminal.TerminalFormatter()
         line = pygments.highlight(line, lexer, formatter)
+        line = line.replace('{', '{{').replace('}', '}}')
         line = line.replace('\033[39;49;00m', '\033[0m')
         line = NO_SEMI_COLOR_CODE_RE.sub(_0semi_adder, line)
         line = RAW_COLOR_CODE_RE.sub(_escape_code_adder, line)