diff --git a/CHANGELOG b/CHANGELOG
index ada4971be..f1a196b80 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,10 +1,15 @@
-Changes between 1.2.1 and 1.2.2 (release pending)
+Changes between 1.2.1 and 1.3.0 (release pending)
 ==================================================
 
-- new mechanism to allow plugins to register new hooks 
+- new mechanism to allow external plugins to register new hooks 
+  (a recent pytest-xdist plugin for distributed and looponfailing 
+  testing requires this feature)
 - (issue85) fix junitxml plugin to handle tests with non-ascii output
 - fix/refine python3 compatibility (thanks Benjamin Peterson)
-- fixes for making the jython/win32 combination work
+- fixes for making the jython/win32 combination work, note however: 
+  jython2.5.1/win32 does not provide a command line launcher, see
+  http://bugs.jython.org/issue1491 . See pylib install documentation
+  for how to work around. 
 - fixes for handling of unicode exception values and unprintable objects
 - (issue87) fix unboundlocal error in assertionold code 
 - (issue86) improve documentation for looponfailing
@@ -17,7 +22,7 @@ Changes between 1.2.1 and 1.2.2 (release pending)
 - new pytest_pycollect_makemodule(path, parent) hook for
   allowing customization of the Module collection object for a 
   matching test module.
-- expose previously internal commonly useful methods: 
+- expose (previously internal) commonly useful methods: 
   py.io.get_terminal_with() -> return terminal width
   py.io.ansi_print(...) -> print colored/bold text on linux/win32
   py.io.saferepr(obj) -> return limited representation string
diff --git a/doc/install.txt b/doc/install.txt
index bf1d435f1..67d727c4d 100644
--- a/doc/install.txt
+++ b/doc/install.txt
@@ -84,8 +84,15 @@ disguise.  You can tell people to download and then e.g. run it like this::
 and ask them to send you the resulting URL.  The resulting script has 
 all core features and runs unchanged under Python2 and Python3 interpreters. 
 
-Troubleshooting
-========================
+Troubleshooting / known issues
+===============================
+
+.. _`Jython does not create command line launchers`: http://bugs.jython.org/issue1491
+
+**Jython2.5.1 on XP**: `Jython does not create command line launchers`_
+so ``py.test`` will not work correctly.  You may install py.test on 
+CPython and type ``py.test --genscript=mytest`` and then use 
+``jython mytest`` to run py.test for your tests to run in Jython. 
 
 **On Linux**: If ``easy_install`` fails because it needs to run
 as the superuser you are trying to install things globally 
diff --git a/py/__init__.py b/py/__init__.py
index 20e416925..36cc5b00d 100644
--- a/py/__init__.py
+++ b/py/__init__.py
@@ -8,7 +8,7 @@ dictionary or an import path.
 
 (c) Holger Krekel and others, 2004-2010
 """
-__version__ = version = "1.2.2"
+__version__ = version = "1.3.0"
 
 import py.apipkg
 
diff --git a/setup.py b/setup.py
index ce5d79ba6..d8dc20943 100644
--- a/setup.py
+++ b/setup.py
@@ -26,7 +26,7 @@ def main():
         name='py',
         description='py.test and pylib: rapid testing and development utils.',
         long_description = long_description,
-        version= '1.2.2',
+        version= '1.3.0',
         url='http://pylib.org',
         license='MIT license',
         platforms=['unix', 'linux', 'osx', 'cygwin', 'win32'],