diff --git a/ChangeLog b/ChangeLog
index 2fde912b..59506e1c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,69 @@
+2016-04-30  rocky <rocky@gnu.org>
+
+	* README.rst, __pkginfo__.py: Get ready for release 2.3.0
+
+2016-04-30  rocky <rocky@gnu.org>
+
+	* uncompyle6/parsers/astnode.py, uncompyle6/parsers/parse3.py,
+	uncompyle6/semantics/pysource.py: Python 3.0..3.2 bug in
+	LOAD_FAST/STORE_LOCAL LOAD_FAST         '__locals__' STORE_LOCALS      '' Also have to adjust doc constants for this crap astnode.py: minor format change
+
+2016-04-30  rocky <rocky@gnu.org>
+
+	* test/Makefile, test/simple_source/def/06_classbug.py,
+	test/test_pythonlib.py: Test optimized Python code and Python 3.2
+
+2016-04-30  rocky <rocky@gnu.org>
+
+	* uncompyle6/parsers/parse3.py: Pevious commit grammar change is
+	Python 3.5 and up
+
+2016-04-30  rocky <rocky@gnu.org>
+
+	* uncompyle6/parsers/parse3.py: Python 3.5 if statments decompyle Sometimes it doesn't need JUMP_FORWARD _come_from _come_from For example: def handle2(module):     if module == 'foo':         try:             module = 1         except ImportError as exc:             module = exc     return module And: if __name__:     for i in (1, 2):         x = 3
+
+2016-04-28  rocky <rocky@gnu.org>
+
+	* requirements.txt, uncompyle6/parser.py,
+	uncompyle6/parsers/parse2.py, uncompyle6/parsers/parse3.py,
+	uncompyle6/semantics/fragments.py, uncompyle6/semantics/pysource.py: 
+	spark -> spark_parser
+
+2016-04-28  rocky <rocky@gnu.org>
+
+	* uncompyle6/parsers/spark.py: Really remove spark - Use external
+	package instead
+
+2016-04-27  R. Bernstein <rocky@users.noreply.github.com>
+
+	* : Merge pull request #8 from rocky/external-spark External spark
+
+2016-04-27  rocky <rocky@gnu.org>
+
+	* .travis.yml, circle.yml: Note dependencies on spark
+
+2016-04-27  rocky <rocky@gnu.org>
+
+	* .gitignore, README.rst, requirements.txt, uncompyle6/parser.py,
+	uncompyle6/parsers/astnode.py, uncompyle6/parsers/parse2.py,
+	uncompyle6/parsers/parse3.py, uncompyle6/semantics/fragments.py,
+	uncompyle6/semantics/pysource.py: Use external spark now.
+
+2016-04-20  rocky <rocky@gnu.org>
+
+	* circle.yml: Back to 2.7.8
+
+2016-04-20  rocky <rocky@gnu.org>
+
+	* circle.yml: Try python 2.7.10
+
 2016-04-19  rocky <rocky@gnu.org>
 
-	* __pkginfo__.py: Get ready for release 2.2.0
+	* README.rst: Remove link to Mysterie uncompyle2 per request
+
+2016-04-19  rocky <rocky@gnu.org>
+
+	* ChangeLog, NEWS, __pkginfo__.py: Get ready for release 2.2.0
 
 2016-04-18  rocky <rocky@gnu.org>
 
diff --git a/NEWS b/NEWS
index a85274a1..67369f99 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,13 @@
+uncompyle6 2.2.1 2016-04-30
+
+- Require spark_parser  >= 1.1.0
+
+uncompyle6 2.2.0 2016-04-30
+
+- Spark is no longer here but pulled separate package spark_parse
+- Python 3 parsing fixes
+- More tests
+
 uncompyle6 2.2.0 2016-04-02
 
 - Support single-mode (in addtion to exec-mode) compilation
diff --git a/README.rst b/README.rst
index 4987e183..ea467330 100644
--- a/README.rst
+++ b/README.rst
@@ -1,4 +1,4 @@
-|downloads| |buildstatus|
+|buildstatus|
 
 uncompyle6
 ==========
diff --git a/__pkginfo__.py b/__pkginfo__.py
index 1596818a..39bd7a3d 100644
--- a/__pkginfo__.py
+++ b/__pkginfo__.py
@@ -9,7 +9,7 @@
 
 # Things that change more often go here.
 copyright   = """
-Copyright (C) 2015 Rocky Bernstein <rb@dustyfeet.com>.
+Copyright (C) 2015, 2016 Rocky Bernstein <rb@dustyfeet.com>.
 """
 
 classifiers =  ['Development Status :: 3 - Alpha',
@@ -31,6 +31,9 @@ classifiers =  ['Development Status :: 3 - Alpha',
 author             = "Rocky Bernstein, Hartmut Goebel, John Aycock, and others"
 author_email       = "rb@dustyfeet.com"
 ftp_url            = None
+install_requires   = ['python-spark >= 1.1.0']
+license            = 'GPL'
+
 # license            = 'BSDish'
 mailing_list       = 'python-debugger@googlegroups.com'
 modname            = 'uncompyle6'
@@ -47,7 +50,7 @@ def get_srcdir():
     return os.path.realpath(filename)
 
 ns = {}
-version            = '2.2.0'
+version            = '2.3.1'
 web                = 'https://github.com/rocky/python-uncompyle6/'
 
 # tracebacks in zip files are funky and not debuggable