diff --git a/.gitignore b/.gitignore
index ddab99e..dd7536b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,3 +3,5 @@
 /3.8.4.3-r1.tar.gz
 /apsw-3.8.11.1-r1.tar.gz
 /apsw-3.8.11.1-r1.zip
+/apsw-3.7.17-r1.zip
+/apsw-3.8.10.1-r1.zip
diff --git a/python-apsw.spec b/python-apsw.spec
index 618d1c6..68177d5 100644
--- a/python-apsw.spec
+++ b/python-apsw.spec
@@ -4,9 +4,30 @@
 %{!?python_sitelib: %global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print (get_python_lib())")}
 %endif
 
-%global sqlite_version 3.8.11.1
+%if 0%{?rhel} = 7
+%global sqlite_version 3.7.17
 %global uprel 1
 %global pkg_version %{sqlite_version}-r%{uprel}
+%endif
+
+%if 0%{?fedora} = 21
+%global sqlite_version 3.8.10
+%global uprel 1
+%global pkg_version %{sqlite_version}.1-r%{uprel}
+%endif
+
+%if 0%{?fedora} = 22
+%global sqlite_version 3.8.10
+%global uprel 1
+%global pkg_version %{sqlite_version}.1-r%{uprel}
+%endif
+
+%if 0%{?fedora} >= 23
+%global sqlite_version 3.8.11
+%global uprel 1
+%global pkg_version %{sqlite_version}.1-r%{uprel}
+%endif
+
 
 %filter_provides_in %{python_sitearch}/.*\.so$ 
 %if 0%{?with_python3}
@@ -16,7 +37,7 @@
 
 Name:               python-apsw
 Version:            %{sqlite_version}.r%{uprel}
-Release:            1%{?dist}
+Release:            2%{?dist}
 Summary:            Another Python SQLite Wrapper
 Group:              Development/Libraries
 License:            zlib
@@ -93,6 +114,9 @@ python2 setup.py install --root %{buildroot}
 %endif # with_python3
 
 %changelog
+* Fri Sep 11 2015 Marcel Wysocki <maci@satgnu.net> - 3.8.11.1.r1-2
+- Merge different versions into one spec file
+
 * Mon Aug 24 2015 Marcel Wysocki <maci@satgnu.net> - 3.8.11.1.r1-1
 - Update to 3.8.11.1-r1 for F24
 
diff --git a/sources b/sources
index 09e49d9..81c8c7f 100644
--- a/sources
+++ b/sources
@@ -1 +1,3 @@
+3516203c369aacbe12a3bed35f60fe4a  apsw-3.7.17-r1.zip
+53aadcfea05f93c0acb9946a17a587d6  apsw-3.8.10.1-r1.zip
 8ec876a2df4766abb32b6bf7e34f3bbf  apsw-3.8.11.1-r1.zip