diff --git a/.gitignore b/.gitignore
index 696e73d..4064b95 100644
--- a/.gitignore
+++ b/.gitignore
@@ -8,3 +8,5 @@
 /libteam-20120627gitcd6b557.tar.gz
 /libteam-20120627git96569f8.tar.gz
 /libteam-20120628gitca7b526.tar.gz
+/libteam-20120807gitf042120.tar.gz
+/libteam-20120807git9fa4a96.tar.gz
diff --git a/libteam.spec b/libteam.spec
index af846d2..f0eb393 100644
--- a/libteam.spec
+++ b/libteam.spec
@@ -1,6 +1,6 @@
 Name: libteam
 Version: 0.1
-Release: 11.20120628gitca7b526%{?dist}
+Release: 12.20120807git9fa4a96%{?dist}
 Summary: Library for controlling team network device
 Group: System Environment/Libraries
 License: LGPLv2+
@@ -9,12 +9,12 @@ URL: http://www.libteam.org
 # following commands to generate the tarball:
 #  git clone git://github.com/jpirko/libteam.git
 #  cd libteam/
-#  git reset --hard ca7b526
+#  git reset --hard 9fa4a96
 #  ./autogen.sh
 #  ./configure
 #  make distcheck
-#  mv libteam-0.1.tar.gz libteam-20120628gitca7b526.tar.gz
-Source0: libteam-20120628gitca7b526.tar.gz
+#  mv libteam-0.1.tar.gz libteam-20120807git9fa4a96.tar.gz
+Source0: libteam-20120807git9fa4a96.tar.gz
 BuildRequires: jansson-devel
 BuildRequires: libdaemon-devel
 BuildRequires: libnl3-devel
@@ -84,13 +84,14 @@ make install DESTDIR=$RPM_BUILD_ROOT INSTALL="install -p"
 find $RPM_BUILD_ROOT -name \*.la -delete
 rm -rf $RPM_BUILD_ROOT/%{_bindir}/team_*
 mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/dbus-1/system.d
-install teamd/dbus/teamd.conf $RPM_BUILD_ROOT%{_sysconfdir}/dbus-1/system.d/
+install -p teamd/dbus/teamd.conf $RPM_BUILD_ROOT%{_sysconfdir}/dbus-1/system.d/
+mkdir -p $RPM_BUILD_ROOT%{_unitdir}
+install -p teamd/redhat/systemd/teamd@.service $RPM_BUILD_ROOT%{_unitdir}
 mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/network-scripts
-install -p -m 644 teamd/redhat/initscripts/teamd $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/
-install -p -m 755 teamd/redhat/initscripts/network-scripts/ifup-Team $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/network-scripts
-install -p -m 755 teamd/redhat/initscripts/network-scripts/ifdown-Team $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/network-scripts
-install -p -m 755 teamd/redhat/initscripts/network-scripts/ifup-TeamPort $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/network-scripts
-install -p -m 755 teamd/redhat/initscripts/network-scripts/ifdown-TeamPort $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/network-scripts
+install -p -m 755 teamd/redhat/initscripts_systemd/network-scripts/ifup-Team $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/network-scripts
+install -p -m 755 teamd/redhat/initscripts_systemd/network-scripts/ifdown-Team $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/network-scripts
+install -p -m 755 teamd/redhat/initscripts_systemd/network-scripts/ifup-TeamPort $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/network-scripts
+install -p -m 755 teamd/redhat/initscripts_systemd/network-scripts/ifdown-TeamPort $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/network-scripts
 cd binding/python
 python ./setup.py install --root $RPM_BUILD_ROOT -O1
 
@@ -114,7 +115,7 @@ python ./setup.py install --root $RPM_BUILD_ROOT -O1
 %defattr(-,root,root,-)
 %doc COPYING teamd/example_configs teamd/redhat/example_ifcfgs/
 %config(noreplace) %attr(644,root,root) %{_sysconfdir}/dbus-1/system.d/teamd.conf
-%config(noreplace) %attr(644,root,root) %{_sysconfdir}/sysconfig/teamd
+%config(noreplace) %attr(644,root,root) %{_unitdir}/teamd@.service
 %{_sysconfdir}/sysconfig/network-scripts/ifup-Team
 %{_sysconfdir}/sysconfig/network-scripts/ifdown-Team
 %{_sysconfdir}/sysconfig/network-scripts/ifup-TeamPort
@@ -129,6 +130,9 @@ python ./setup.py install --root $RPM_BUILD_ROOT -O1
 %{python_sitearch}/*
 
 %changelog
+* Thu Aug 07 2012 Jiri Pirko <jpirko@redhat.com> - 0.1-12.20120807git9fa4a96
+- Rebase to git commit 9fa4a96
+
 * Thu Jul 19 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.1-11.20120628gitca7b526
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
 
diff --git a/sources b/sources
index dff9dd1..ea95681 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-95213e865a2ab1a27eead2699000d2f3  libteam-20120628gitca7b526.tar.gz
+a056af29572f3c3aa7c32b161ad4175d  libteam-20120807git9fa4a96.tar.gz