diff --git a/CHANGELOG b/CHANGELOG
index 7b3f42c26..4c5694ec7 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -29,6 +29,8 @@ Changes between 2.0.1 and 2.0.2
   of test ids that you can use to paste to the py.test commandline
   in order to execute a particular test.
 
+- fix issue25 avoid reported problems with --pdb and python3.2/encodings output
+
 - fix issue23 - tmpdir argument now works on Python3.2 and WindowsXP
   Starting with Python3.2 os.symlink may be supported. By requiring
   a newer py lib version the py.path.local() implementation acknowledges
diff --git a/_pytest/pdb.py b/_pytest/pdb.py
index 507f93d7a..d9b4c2de8 100644
--- a/_pytest/pdb.py
+++ b/_pytest/pdb.py
@@ -52,7 +52,10 @@ class PdbInvoke:
         if "xfail" in rep.keywords:
             return rep
         # we assume that the above execute() suspended capturing
-        tw = py.io.TerminalWriter()
+        # XXX we re-use the TerminalReporter's terminalwriter
+        # because this seems to avoid some encoding related troubles
+        # for not completely clear reasons.
+        tw = item.config.pluginmanager.getplugin("terminalreporter")._tw
         tw.line()
         tw.sep(">", "traceback")
         rep.toterminal(tw)
diff --git a/pytest.py b/pytest.py
index 2aee852a2..4f21ac899 100644
--- a/pytest.py
+++ b/pytest.py
@@ -1,7 +1,7 @@
 """
 unit and functional testing with Python.
 """
-__version__ = '2.0.2.dev5'
+__version__ = '2.0.2.dev6'
 __all__ = ['main']
 
 from _pytest.core import main, UsageError, _preloadplugins
diff --git a/setup.py b/setup.py
index 2b29d833d..7a464a0c0 100644
--- a/setup.py
+++ b/setup.py
@@ -22,7 +22,7 @@ def main():
         name='pytest',
         description='py.test: simple powerful testing with Python',
         long_description = long_description,
-        version='2.0.2.dev5',
+        version='2.0.2.dev6',
         url='http://pytest.org',
         license='MIT license',
         platforms=['unix', 'linux', 'osx', 'cygwin', 'win32'],