diff --git a/python-astropy-system-ply.patch b/python-astropy-system-ply.patch
new file mode 100644
index 0000000..0b4da81
--- /dev/null
+++ b/python-astropy-system-ply.patch
@@ -0,0 +1,36 @@
+diff -ur astropy-0.3.2/astropy/coordinates/angle_utilities.py astropy-0.3.2.ply/astropy/coordinates/angle_utilities.py
+--- astropy-0.3.2/astropy/coordinates/angle_utilities.py	2014-05-22 11:59:59.700577989 +0200
++++ astropy-0.3.2.ply/astropy/coordinates/angle_utilities.py	2014-05-22 12:01:18.907194201 +0200
+@@ -51,7 +51,7 @@
+ 
+     @classmethod
+     def _make_parser(cls):
+-        from ..extern.ply import lex, yacc
++        from ply import lex, yacc
+ 
+         # List of token names.
+         tokens = (
+diff -ur astropy-0.3.2/astropy/units/format/cds.py astropy-0.3.2.ply/astropy/units/format/cds.py
+--- astropy-0.3.2/astropy/units/format/cds.py	2014-05-22 11:59:59.814578873 +0200
++++ astropy-0.3.2.ply/astropy/units/format/cds.py	2014-05-22 12:01:32.922303728 +0200
+@@ -63,7 +63,7 @@
+         YACC grammar in the `unity library
+         <https://bitbucket.org/nxg/unity/>`_.
+         """
+-        from ...extern.ply import lex, yacc
++        from ply import lex, yacc
+ 
+         tokens = (
+             'PRODUCT',
+diff -ur astropy-0.3.2/astropy/units/format/generic.py astropy-0.3.2.ply/astropy/units/format/generic.py
+--- astropy-0.3.2/astropy/units/format/generic.py	2014-05-22 11:59:59.817578896 +0200
++++ astropy-0.3.2.ply/astropy/units/format/generic.py	2014-05-22 12:01:48.698427183 +0200
+@@ -48,7 +48,7 @@
+         formats, the only difference being the set of available unit
+         strings.
+         """
+-        from ...extern.ply import lex, yacc
++        from ply import lex, yacc
+ 
+         tokens = (
+             'DOUBLE_STAR',
diff --git a/python-astropy.spec b/python-astropy.spec
index 08588d9..f713944 100644
--- a/python-astropy.spec
+++ b/python-astropy.spec
@@ -3,7 +3,7 @@
 
 Name: python-astropy
 Version: 0.3.2
-Release: 2%{?dist}
+Release: 3%{?dist}
 Summary: A Community Python Library for Astronomy
 License: BSD
 
@@ -16,10 +16,11 @@ Patch2: python-astropy-system-pytest.patch
 Patch3: python-astropy-system-six.patch
 Patch4: python-astropy-bug2171.patch
 Patch5: python-astropy-skiptest.patch
+Patch6: python-astropy-system-ply.patch
 
 BuildRequires: python2-devel python-setuptools numpy
 BuildRequires: scipy h5py
-BuildRequires: git Cython pytest python-six
+BuildRequires: git Cython pytest python-six python-ply
 BuildRequires: python-sphinx graphviz
 BuildRequires: python-matplotlib
 BuildRequires: python-configobj
@@ -29,11 +30,13 @@ BuildRequires: wcslib-devel >= 4.20
 BuildRequires: erfa-devel
 
 Requires: numpy
-Requires: python-configobj pytest python-six
+Requires: python-configobj pytest python-six python-ply
 # Optionals
 Requires: scipy h5py
 Requires: /usr/bin/xmllint
 
+Provides: bundled(jquery) = 1.10
+
 # we don't want to provide private python extension libs
 %global __provides_exclude_from ^(%{python2_sitearch}|%{python3_sitearch})/.*\\.so$
 
@@ -58,7 +61,7 @@ This package contains the full API documentation for %{name}.
 %package -n python3-%{upname}
 Summary: A Community Python Library for Astronomy
 BuildRequires: python3-devel python3-setuptools python3-numpy
-BuildRequires: git python3-Cython python3-pytest python3-six
+BuildRequires: git python3-Cython python3-pytest python3-six python3-ply
 BuildRequires: python3-scipy python3-h5py
 BuildRequires: python3-sphinx graphviz
 BuildRequires: python3-matplotlib
@@ -74,10 +77,13 @@ Requires: python3-numpy
 Requires: python3-configobj
 Requires: python3-pytest
 Requires: python3-six
+Requires: python3-ply
 # Optionals
 Requires: python3-scipy python3-h5py
 Requires: /usr/bin/xmllint
 
+Provides: bundled(jquery) = 1.10
+
 %description -n python3-%{upname}
 The Astropy project is a common effort to develop a single core package 
 for Astronomy.  Major packages such as PyFITS, PyWCS, vo, and asciitable 
@@ -130,6 +136,10 @@ rm -rf astropy/extern/pytest*
 rm -rf astropy/extern/six.py*
 %patch3 -p1
 
+# Unbundle ply
+rm -rf astropy/extern/ply*
+%patch6 -p1
+
 # https://github.com/astropy/astropy/issues/2171
 %patch4 -p1
 # https://github.com/astropy/astropy/issues/2516
@@ -187,9 +197,6 @@ for i in %{buildroot}/usr/bin/*; do
 done
 
 %check
-# Disable checks until 
-# https://github.com/astropy/astropy/issues/2171
-# gets fixed
 pushd %{buildroot}/%{python2_sitearch}
 py.test-%{python2_version}  astropy
 popd
@@ -224,6 +231,10 @@ popd
 %endif # with_python3
 
 %changelog
+* Thu May 22 2014 Sergio Pascual <sergiopr@fedoraproject.org> - 0.3.2-3
+- Astropy bundles jquery
+- Unbundle plpy
+
 * Thu May 22 2014 Sergio Pascual <sergiopr@fedoraproject.org> - 0.3.2-2
 - Add missing patches