diff --git a/.python-rtslib.metadata b/.python-rtslib.metadata
new file mode 100644
index 0000000..2bdbd6a
--- /dev/null
+++ b/.python-rtslib.metadata
@@ -0,0 +1 @@
+ac3a43536485db816321f9043c97a55299ebf5a6 SOURCES/rtslib-fb-2.1.fb41.tar.gz
diff --git a/README.md b/README.md
deleted file mode 100644
index 0e7897f..0000000
--- a/README.md
+++ /dev/null
@@ -1,5 +0,0 @@
-The master branch has no content
-
-Look at the c7 branch if you are working with CentOS-7, or the c4/c5/c6 branch for CentOS-4, 5 or 6
-
-If you find this file in a distro specific branch, it means that no content has been checked in yet
diff --git a/SOURCES/0001-Turn-off-unsupported-fabrics.patch b/SOURCES/0001-Turn-off-unsupported-fabrics.patch
new file mode 100644
index 0000000..b104944
--- /dev/null
+++ b/SOURCES/0001-Turn-off-unsupported-fabrics.patch
@@ -0,0 +1,32 @@
+From bca7ea48b5ab9e7ac1d16a5b1e729ab4814539b9 Mon Sep 17 00:00:00 2001
+From: Andy Grover <agrover@redhat.com>
+Date: Mon, 7 Oct 2013 15:32:27 -0700
+Subject: [PATCH] Turn off unsupported fabrics
+
+Signed-off-by: Andy Grover <agrover@redhat.com>
+---
+ rtslib/fabric.py | 6 +++---
+ 1 files changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/rtslib/fabric.py b/rtslib/fabric.py
+index e84e1b9..07acf24 100644
+--- a/rtslib/fabric.py
++++ b/rtslib/fabric.py
+@@ -441,11 +441,11 @@ fabric_modules = {
+ "srpt": SRPTFabricModule,
+ "iscsi": ISCSIFabricModule,
+ "loopback": LoopbackFabricModule,
+- "qla2xxx": Qla2xxxFabricModule,
+- "sbp": SBPFabricModule,
++# "qla2xxx": Qla2xxxFabricModule,
++# "sbp": SBPFabricModule,
+ "tcm_fc": FCoEFabricModule,
+ # "usb_gadget": USBGadgetFabricModule, # very rare, don't show
+- "vhost": VhostFabricModule,
++# "vhost": VhostFabricModule,
+ }
+
+ #
+--
+1.7.1
+
diff --git a/SOURCES/rtslib-fix-setup.patch b/SOURCES/rtslib-fix-setup.patch
new file mode 100644
index 0000000..fb67195
--- /dev/null
+++ b/SOURCES/rtslib-fix-setup.patch
@@ -0,0 +1,46 @@
+diff --git a/rtslib/root.py b/rtslib/root.py
+index 246c285..d558445 100644
+--- a/rtslib/root.py
++++ b/rtslib/root.py
+@@ -70,6 +70,7 @@ class RTSRoot(CFSNode):
+ base kernel modules (tcm)
+ '''
+ super(RTSRoot, self).__init__()
++ modprobe('configfs')
+ mount_configfs()
+ modprobe('target_core_mod')
+ self._create_in_cfs_ine('any')
+@@ -247,7 +248,7 @@ class RTSRoot(CFSNode):
+ if not restore_file:
+ restore_file = default_save_file
+
+- with open(from_file, "r") as f:
++ with open(restore_file, "r") as f:
+ config = json.loads(f.read())
+ return self.restore(config, clear_existing=True,
+ abort_on_error=abort_on_error)
+diff --git a/scripts/targetctl b/scripts/targetctl
+index db8e0d2..bdf59f4 100755
+--- a/scripts/targetctl
++++ b/scripts/targetctl
+@@ -42,8 +42,7 @@ def save(to_file):
+ RTSRoot().save_to_file(save_file=to_file)
+
+ def restore(from_file):
+- errors = RTSRoot().restore_from_file(restore_file=from_file,
+- clear_existing=True)
++ errors = RTSRoot().restore_from_file(restore_file=from_file)
+
+ if errors:
+ print("Restore failed, %d errors:" % len(errors), file=err)
+diff --git a/setup.py b/setup.py
+index 7f41d52..5886fbc 100755
+--- a/setup.py
++++ b/setup.py
+@@ -27,5 +27,6 @@ setup (
+ maintainer_email = 'agrover@redhat.com',
+ url = 'http://github.com/agrover/rtslib-fb',
+ packages = ['rtslib'],
++ scripts = ['scripts/targetctl'],
+ use_2to3 = True,
+ )
diff --git a/SOURCES/target.service b/SOURCES/target.service
new file mode 100644
index 0000000..aa0a51b
--- /dev/null
+++ b/SOURCES/target.service
@@ -0,0 +1,15 @@
+[Unit]
+Description=Restore LIO kernel target configuration
+Requires=sys-kernel-config.mount
+After=sys-kernel-config.mount network.target local-fs.target
+
+[Service]
+Type=oneshot
+RemainAfterExit=yes
+ExecStart=/usr/bin/targetctl restore
+ExecStop=/usr/bin/targetctl clear
+SyslogIdentifier=target
+
+[Install]
+WantedBy=multi-user.target
+
diff --git a/SPECS/python-rtslib.spec b/SPECS/python-rtslib.spec
new file mode 100644
index 0000000..cfe924a
--- /dev/null
+++ b/SPECS/python-rtslib.spec
@@ -0,0 +1,293 @@
+%if 0%{?fedora}
+%global with_python3 1
+%endif
+
+%global oname rtslib-fb
+
+Name: python-rtslib
+License: ASL 2.0
+Group: System Environment/Libraries
+Summary: API for Linux kernel LIO SCSI target
+Version: 2.1.fb41
+Release: 3%{?dist}
+URL: https://fedorahosted.org/targetcli-fb/
+Source: https://fedorahosted.org/released/targetcli-fb/%{oname}-%{version}.tar.gz
+Source1: target.service
+Patch0: 0001-Turn-off-unsupported-fabrics.patch
+Patch1: rtslib-fix-setup.patch
+BuildArch: noarch
+BuildRequires: python-devel epydoc python-setuptools systemd-units
+Requires: python-kmod
+Requires(post): systemd
+Requires(preun): systemd
+Requires(postun): systemd
+
+%if 0%{?with_python3}
+BuildRequires: python3-devel python-tools python3-setuptools
+%endif
+
+%package doc
+Summary: Documentation for python-rtslib
+Group: Documentation
+Requires: %{name} = %{version}-%{release}
+
+
+%description
+API for generic Linux SCSI kernel target. Includes the 'target'
+service and targetctl tool for restoring configuration.
+
+%description doc
+API documentation for rtslib, to configure the generic Linux SCSI
+multiprotocol kernel target.
+
+%if 0%{?with_python3}
+%package -n python3-rtslib
+Summary: API for Linux kernel LIO SCSI target
+Group: System Environment/Libraries
+
+%description -n python3-rtslib
+API for generic Linux SCSI kernel target.
+%endif
+
+%prep
+%setup -q -n %{oname}-%{version}
+%patch0 -p1
+%patch1 -p1
+
+%if 0%{?with_python3}
+rm -rf %{py3dir}
+cp -a . %{py3dir}
+%endif
+
+%build
+%{__python} setup.py build
+gzip --stdout doc/targetctl.8 > doc/targetctl.8.gz
+gzip --stdout doc/saveconfig.json.5 > doc/saveconfig.json.5.gz
+mkdir -p doc/html
+epydoc --no-sourcecode --html -n rtslib -o doc/html rtslib/*.py
+
+%if 0%{?with_python3}
+pushd %{py3dir}
+2to3 --write --nobackups .
+%{__python3} setup.py build
+popd
+%endif
+
+%install
+%{__python} setup.py install --skip-build --root %{buildroot}
+mkdir -p %{buildroot}%{_mandir}/man8/
+mkdir -p %{buildroot}%{_mandir}/man5/
+mkdir -p %{buildroot}%{_unitdir}
+install -m 644 %{SOURCE1} %{buildroot}%{_unitdir}/target.service
+install -m 644 doc/targetctl.8.gz %{buildroot}%{_mandir}/man8/
+install -m 644 doc/saveconfig.json.5.gz %{buildroot}%{_mandir}/man5/
+
+%if 0%{?with_python3}
+pushd %{py3dir}
+# We don't want py3-converted scripts overwriting py2 scripts
+# Shunt them elsewhere then delete
+%{__python3} setup.py install --skip-build --root %{buildroot} --install-scripts py3scripts
+rm -rf %{buildroot}/py3scripts
+popd
+%endif
+
+%post
+%systemd_post target.service
+
+%preun
+%systemd_preun target.service
+
+%postun
+%systemd_postun_with_restart target.service
+
+%files
+%{python_sitelib}/*
+%{_bindir}/targetctl
+%{_unitdir}/target.service
+%doc COPYING README.md
+%{_mandir}/man8/targetctl.8.gz
+%{_mandir}/man5/saveconfig.json.5.gz
+
+%if 0%{?with_python3}
+%files -n python3-rtslib
+%{python3_sitelib}/*
+%doc COPYING README.md
+%endif
+
+%files doc
+%doc doc/html
+
+%changelog
+* Wed Nov 6 2013 Andy Grover <agrover@redhat.com> - 2.1.fb41-3
+- Don't overwrite py2 scripts with py3 scripts
+
+* Mon Nov 4 2013 Andy Grover <agrover@redhat.com> - 2.1.fb41-2
+- Update rtslib-fix-setup.patch with backported fixups
+- Add in missing systemd requires
+
+* Fri Nov 1 2013 Andy Grover <agrover@redhat.com> - 2.1.fb41-1
+- New upstream version
+- Remove obsolete spec stuff: clean, buildroot
+- Add target.service
+
+* Mon Sep 23 2013 Andy Grover <agrover@redhat.com> - 2.1.fb40-1
+- New upstream version, fixes restore of mappedluns
+
+* Wed Sep 11 2013 Andy Grover <agrover@redhat.com> - 2.1.fb39-1
+- New upstream version, fixes fcoe
+
+* Tue Sep 10 2013 Andy Grover <agrover@redhat.com> - 2.1.fb38-1
+- New upstream version
+
+* Sun Aug 04 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.1.fb37-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
+
+* Tue Jul 23 2013 Andy Grover <agrover@redhat.com> - 2.1.fb37-1
+- New upstream version
+- License now Apache 2.0
+
+* Tue Jul 2 2013 Andy Grover <agrover@redhat.com> - 2.1.fb36-1
+- New upstream version
+- Remove fix-tabs.patch
+
+* Fri Jun 7 2013 Andy Grover <agrover@redhat.com> - 2.1.fb35-1
+- New upstream version
+- add fix-tabs.patch
+
+* Thu May 9 2013 Andy Grover <agrover@redhat.com> - 2.1.fb34-1
+- New upstream version
+
+* Thu May 2 2013 Andy Grover <agrover@redhat.com> - 2.1.fb33-1
+- New upstream version
+- Update source file location
+
+* Tue Apr 16 2013 Andy Grover <agrover@redhat.com> - 2.1.fb32-2
+- Add python3 subpackage
+
+* Tue Apr 9 2013 Andy Grover <agrover@redhat.com> - 2.1.fb32-1
+- New upstream version
+
+* Tue Feb 26 2013 Andy Grover <agrover@redhat.com> - 2.1.fb30-1
+- New upstream version
+- Update description and summary
+- Remove patch0, upstream doesn't include usb gadget any more
+
+* Thu Feb 14 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.1.fb28-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
+
+* Mon Jan 7 2013 Andy Grover <agrover@redhat.com> - 2.1.fb28-1
+- New upstream version
+
+* Wed Jan 2 2013 Andy Grover <agrover@redhat.com> - 2.1.fb27-1
+- Specfiles removed upstream, remove handling
+- Refresh no-usb.patch
+
+* Thu Dec 20 2012 Andy Grover <agrover@redhat.com> - 2.1.fb26-1
+- New upstream release
+- Remove kernel dependency
+- Remove python-ethtool and python-ipaddr dependencies
+
+* Tue Nov 13 2012 Andy Grover <agrover@redhat.com> - 2.1.fb24-1
+- New upstream release
+
+* Tue Oct 30 2012 Andy Grover <agrover@redhat.com> - 2.1.fb23-1
+- New upstream release
+
+* Thu Sep 6 2012 Andy Grover <agrover@redhat.com> - 2.1.fb22-1
+- New upstream release
+
+* Wed Aug 8 2012 Andy Grover <agrover@redhat.com> - 2.1.fb21-1
+- New upstream release
+
+* Tue Aug 7 2012 Andy Grover <agrover@redhat.com> - 2.1.fb20-2
+- Add patch no-usb.patch
+
+* Tue Aug 7 2012 Andy Grover <agrover@redhat.com> - 2.1.fb20-1
+- New upstream release. Add kernel version dependency.
+- Don't claim python_sitelib
+
+* Thu Aug 2 2012 Andy Grover <agrover@redhat.com> - 2.1.fb19-1
+- New upstream release. Add kmod dependency.
+
+* Tue Jul 31 2012 Andy Grover <agrover@redhat.com> - 2.1.fb18-1
+- New upstream release. Remove configobj dependency
+
+* Sat Jul 21 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.1.fb17-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
+
+* Thu Jun 28 2012 Andy Grover <agrover@redhat.com> - 2.1.fb17-1
+- New upstream release
+- Remove patch retry-target-creation.patch, upstream has alternate
+ fix.
+
+* Tue Jun 12 2012 Andy Grover <agrover@redhat.com> - 2.1.fb15-1
+- New upstream release
+
+* Wed May 30 2012 Andy Grover <agrover@redhat.com> - 2.1.fb14-1
+- Update Source URL to proper tarball
+- Add patch retry-target-creation.patch
+- New upstream release
+
+* Mon Apr 9 2012 Andy Grover <agrover@redhat.com> - 2.1.fb13-1
+- New upstream release
+
+* Wed Feb 29 2012 Andy Grover <agrover@redhat.com> - 2.1.fb12-2
+- Add -doc package of epydoc-generated html docs
+
+* Wed Feb 29 2012 Andy Grover <agrover@redhat.com> - 2.1.fb12-1
+- New upstream release
+
+* Tue Feb 21 2012 Andy Grover <agrover@redhat.com> - 2.1.fb11-1
+- New upstream release
+
+* Fri Feb 10 2012 Andy Grover <agrover@redhat.com> - 2.1.fb9-1
+- New upstream release
+
+* Fri Feb 3 2012 Andy Grover <agrover@redhat.com> - 2.1.fb8-1
+- New upstream release
+
+* Tue Jan 24 2012 Andy Grover <agrover@redhat.com> - 2.1.fb7-1
+- New upstream release
+
+* Tue Jan 24 2012 Andy Grover <agrover@redhat.com> - 2.1.fb6-1
+- New upstream release
+
+* Fri Jan 13 2012 Andy Grover <agrover@redhat.com> - 2.1.fb5-1
+- New upstream release
+
+* Fri Jan 13 2012 Andy Grover <agrover@redhat.com> - 2.1.fb4-1
+- New upstream release
+
+* Tue Jan 10 2012 Andy Grover <agrover@redhat.com> - 2.1.fb3-1
+- New upstream release
+
+* Tue Dec 6 2011 Andy Grover <agrover@redhat.com> - 2.1.fb2-1
+- New upstream release
+
+* Tue Dec 6 2011 Andy Grover <agrover@redhat.com> - 2.1.fb1-1
+- Change upstream URL
+- New upstream release
+- Remove upstreamed patches:
+ * python-rtslib-git-version.patch
+ * python-rtslib-use-ethtool.patch
+ * python-rtslib-update-specpath.patch
+
+* Mon Nov 14 2011 Andy Grover <agrover@redhat.com> - 1.99.1.git644eece-8
+- Change archive instructions to use gzip -n
+- Fix issues raised in Fedora package review (#744349)
+
+* Thu Oct 6 2011 Andy Grover <agrover@redhat.com> - 1.99.1.git644eece-7
+- Remove patch
+ * python-rtslib-del-unused-specs.patch
+
+* Wed Aug 17 2011 Andy Grover <agrover@redhat.com> - 1.99-6
+- Update based on review comments
+ - Fully document steps to build archive
+ - Remove commented-out extraneous text
+ - Remove a repeat in Requires line
+ - Update git-version.patch to have proper sha1
+ - Change location of fabric spec files to /var/lib/target
+- Remove unused specs
+
+* Tue May 10 2011 Andy Grover <agrover@redhat.com> - 1.99-1
+- Initial packaging