diff --git a/.gitignore b/.gitignore
index 075373f..2b5f8e2 100644
--- a/.gitignore
+++ b/.gitignore
@@ -13,3 +13,4 @@
 /astropy-1.0.6.tar.gz
 /astropy-1.1.1.tar.gz
 /astropy-1.1.2.tar.gz
+/astropy-1.2.1.tar.gz
diff --git a/python-astropy-system-configobj.patch b/python-astropy-system-configobj.patch
index 171b5a5..72d116d 100644
--- a/python-astropy-system-configobj.patch
+++ b/python-astropy-system-configobj.patch
@@ -1,13 +1,12 @@
-diff -ur astropy-1.1.post2/astropy/config/configuration.py astropy-1.1.post2.configobj/astropy/config/configuration.py
---- astropy-1.1.post2/astropy/config/configuration.py	2015-12-11 18:45:19.000000000 +0100
-+++ astropy-1.1.post2.configobj/astropy/config/configuration.py	2016-01-06 18:48:19.049244958 +0100
-@@ -23,7 +23,8 @@
- import types
+diff -ur astropy-1.2.1/astropy/config/configuration.py astropy-1.2.1.co/astropy/config/configuration.py
+--- astropy-1.2.1/astropy/config/configuration.py	2016-06-22 16:32:13.000000000 +0200
++++ astropy-1.2.1.co/astropy/config/configuration.py	2016-07-14 22:12:58.211075218 +0200
+@@ -19,7 +19,7 @@
+ import re
  from warnings import warn
  
 -from ..extern.configobj import configobj, validate
-+import configobj
-+import validate
++import configobj, validate
  from ..utils.exceptions import AstropyWarning, AstropyDeprecationWarning
  from ..utils import find_current_module
  from ..utils.introspection import resolve_name
diff --git a/python-astropy.spec b/python-astropy.spec
index f90f923..5714d29 100644
--- a/python-astropy.spec
+++ b/python-astropy.spec
@@ -7,13 +7,13 @@
 %global srcname astropy
 
 Name: python-astropy
-Version: 1.1.2
+Version: 1.2.1
 Release: 1%{?dist}
 Summary: A Community Python Library for Astronomy
 License: BSD
 
 URL: http://astropy.org
-Source0: http://pypi.python.org/packages/source/a/astropy/astropy-%{version}.tar.gz
+Source0: https://pypi.io/packages/source/a/astropy/astropy-%{version}.tar.gz
 Source1: astropy-README.dist
 Source2: astropy-ply.py
 Patch0: python-astropy-system-configobj.patch
@@ -156,7 +156,7 @@ rm -rf astropy*egg-info
 %patch0 -p1
 # Use system pytest
 %patch1 -p1
-# Use system six
+## Use system six
 %patch2 -p1
 # Use system ply
 cp %{SOURCE2} astropy/extern/ply.py
@@ -242,6 +242,9 @@ popd
 %endif # with_python3
 
 %changelog
+* Fri Jul 15 2016 Sergio Pascual <sergiopr@fedoraproject.org> - 1.2.1-1
+- New upstream (1.2.1)
+
 * Thu Apr 14 2016 Sergio Pascual <sergiopr@fedoraproject.org> - 1.1.2-1
 - New upstream (1.1.2)
 - Uses wcslib 5
diff --git a/sources b/sources
index aab686f..c4f0a8a 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-cbe32023b5b1177d1e2498a0d00cda51  astropy-1.1.2.tar.gz
+a3399f67897cdb75e0efa56c463b0497  astropy-1.2.1.tar.gz