diff --git a/.audit.metadata b/.audit.metadata
new file mode 100644
index 0000000..935e45b
--- /dev/null
+++ b/.audit.metadata
@@ -0,0 +1 @@
+fb135dc049b3cc60843045fd67fa9704b4aba67a SOURCES/audit-2.3.2.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/ausearch.patch b/SOURCES/ausearch.patch
new file mode 100644
index 0000000..0dccd6a
--- /dev/null
+++ b/SOURCES/ausearch.patch
@@ -0,0 +1,11 @@
+diff -ur tags/audit-2.3.2/src/ausearch-parse.c trunk/src/ausearch-parse.c
+--- tags/audit-2.3.2/src/ausearch-parse.c 2013-07-29 17:36:18.412837824 -0400
++++ trunk/src/ausearch-parse.c 2013-08-01 09:37:48.661798043 -0400
+@@ -98,6 +98,7 @@
+ case AUDIT_PATH:
+ ret = parse_path(n, s);
+ break;
++ case AUDIT_USER:
+ case AUDIT_FIRST_USER_MSG...AUDIT_LAST_USER_MSG:
+ case AUDIT_FIRST_USER_MSG2...AUDIT_LAST_USER_MSG2:
+ ret = parse_user(n, s);
diff --git a/SOURCES/mac_config_change.patch b/SOURCES/mac_config_change.patch
new file mode 100644
index 0000000..b3f1e50
--- /dev/null
+++ b/SOURCES/mac_config_change.patch
@@ -0,0 +1,24 @@
+Index: lib/libaudit.h
+===================================================================
+--- lib/libaudit.h (revision 872)
++++ lib/libaudit.h (working copy)
+@@ -186,6 +186,7 @@
+ #define AUDIT_FS_RELABEL 2309 /* Filesystem relabeled */
+ #define AUDIT_USER_MAC_POLICY_LOAD 2310 /* Userspc daemon loaded policy */
+ #define AUDIT_ROLE_MODIFY 2311 /* Admin modified a role */
++#define AUDIT_USER_MAC_CONFIG_CHANGE 2312 /* Change made to MAC policy */
+
+ #define AUDIT_FIRST_CRYPTO_MSG 2400
+ #define AUDIT_CRYPTO_TEST_USER 2400 /* Crypto test results */
+Index: lib/msg_typetab.h
+===================================================================
+--- lib/msg_typetab.h (revision 871)
++++ lib/msg_typetab.h (working copy)
+@@ -190,6 +190,7 @@
+ _S(AUDIT_FS_RELABEL, "FS_RELABEL" )
+ _S(AUDIT_USER_MAC_POLICY_LOAD, "USER_MAC_POLICY_LOAD" )
+ _S(AUDIT_ROLE_MODIFY, "ROLE_MODIFY" )
++_S(AUDIT_USER_MAC_CONFIG_CHANGE, "USER_MAC_CONFIG_CHANGE" )
+ _S(AUDIT_CRYPTO_TEST_USER, "CRYPTO_TEST_USER" )
+ _S(AUDIT_CRYPTO_PARAM_CHANGE_USER, "CRYPTO_PARAM_CHANGE_USER" )
+ _S(AUDIT_CRYPTO_LOGIN, "CRYPTO_LOGIN" )
diff --git a/SPECS/audit.spec b/SPECS/audit.spec
new file mode 100644
index 0000000..ecc5a3f
--- /dev/null
+++ b/SPECS/audit.spec
@@ -0,0 +1,397 @@
+%{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
+
+# Do we want systemd?
+%define WITH_SYSTEMD 1
+
+Summary: User space tools for 2.6 kernel auditing
+Name: audit
+Version: 2.3.2
+Release: 3%{?dist}
+License: GPLv2+
+Group: System Environment/Daemons
+URL: http://people.redhat.com/sgrubb/audit/
+Source0: http://people.redhat.com/sgrubb/audit/%{name}-%{version}.tar.gz
+# Fixed upstream
+Patch1: ausearch.patch
+# Upstream commit 881
+Patch2: mac_config_change.patch
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+BuildRequires: swig python-devel
+BuildRequires: tcp_wrappers-devel krb5-devel libcap-ng-devel
+BuildRequires: kernel-headers >= 2.6.29
+Requires: %{name}-libs = %{version}-%{release}
+%if %{WITH_SYSTEMD}
+BuildRequires: systemd-units
+Requires(post): systemd-units systemd-sysv chkconfig coreutils
+Requires(preun): systemd-units
+Requires(postun): systemd-units coreutils
+%else
+Requires: chkconfig
+%endif
+
+%description
+The audit package contains the user space utilities for
+storing and searching the audit records generate by
+the audit subsystem in the Linux 2.6 kernel.
+
+%package libs
+Summary: Dynamic library for libaudit
+License: LGPLv2+
+Group: Development/Libraries
+
+%description libs
+The audit-libs package contains the dynamic libraries needed for
+applications to use the audit framework.
+
+%package libs-devel
+Summary: Header files for libaudit
+License: LGPLv2+
+Group: Development/Libraries
+Requires: %{name}-libs = %{version}
+Requires: kernel-headers >= 2.6.29
+
+%description libs-devel
+The audit-libs-devel package contains the header files needed for
+developing applications that need to use the audit framework libraries.
+
+%package libs-static
+Summary: Static version of libaudit library
+License: LGPLv2+
+Group: Development/Libraries
+Requires: kernel-headers >= 2.6.29
+
+%description libs-static
+The audit-libs-static package contains the static libraries
+needed for developing applications that need to use static audit
+framework libraries
+
+%package libs-python
+Summary: Python bindings for libaudit
+License: LGPLv2+
+Group: Development/Libraries
+Requires: %{name}-libs = %{version}-%{release}
+
+%description libs-python
+The audit-libs-python package contains the bindings so that libaudit
+and libauparse can be used by python.
+
+%package -n audispd-plugins
+Summary: Plugins for the audit event dispatcher
+License: GPLv2+
+Group: System Environment/Daemons
+BuildRequires: openldap-devel
+Requires: %{name} = %{version}-%{release}
+Requires: %{name}-libs = %{version}-%{release}
+Requires: openldap
+
+%description -n audispd-plugins
+The audispd-plugins package provides plugins for the real-time
+interface to the audit system, audispd. These plugins can do things
+like relay events to remote machines or analyze events for suspicious
+behavior.
+
+%prep
+%setup -q
+%patch1 -p1
+%patch2 -p0
+
+%build
+%configure --sbindir=/sbin --libdir=/%{_lib} --with-python=yes --with-libwrap --enable-gssapi-krb5=yes --with-libcap-ng=yes --with-armeb --with-aarch64 \
+%if %{WITH_SYSTEMD}
+ --enable-systemd
+%endif
+
+make %{?_smp_mflags}
+
+%install
+rm -rf $RPM_BUILD_ROOT
+mkdir -p $RPM_BUILD_ROOT/{sbin,etc/audispd/plugins.d}
+%if !%{WITH_SYSTEMD}
+mkdir -p $RPM_BUILD_ROOT/{etc/{sysconfig,rc.d/init.d}}
+%endif
+mkdir -p $RPM_BUILD_ROOT/%{_mandir}/{man5,man8}
+mkdir -p $RPM_BUILD_ROOT/%{_lib}
+mkdir -p $RPM_BUILD_ROOT/%{_libdir}/audit
+mkdir -p $RPM_BUILD_ROOT/%{_var}/log/audit
+mkdir -p $RPM_BUILD_ROOT/%{_var}/spool/audit
+make DESTDIR=$RPM_BUILD_ROOT install
+
+mkdir -p $RPM_BUILD_ROOT/%{_libdir}
+# This winds up in the wrong place when libtool is involved
+mv $RPM_BUILD_ROOT/%{_lib}/libaudit.a $RPM_BUILD_ROOT%{_libdir}
+mv $RPM_BUILD_ROOT/%{_lib}/libauparse.a $RPM_BUILD_ROOT%{_libdir}
+curdir=`pwd`
+cd $RPM_BUILD_ROOT/%{_libdir}
+LIBNAME=`basename \`ls $RPM_BUILD_ROOT/%{_lib}/libaudit.so.1.*.*\``
+ln -s ../../%{_lib}/$LIBNAME libaudit.so
+LIBNAME=`basename \`ls $RPM_BUILD_ROOT/%{_lib}/libauparse.so.0.*.*\``
+ln -s ../../%{_lib}/$LIBNAME libauparse.so
+cd $curdir
+# Remove these items so they don't get picked up.
+rm -f $RPM_BUILD_ROOT/%{_lib}/libaudit.so
+rm -f $RPM_BUILD_ROOT/%{_lib}/libauparse.so
+rm -f $RPM_BUILD_ROOT/%{_lib}/libaudit.la
+rm -f $RPM_BUILD_ROOT/%{_lib}/libauparse.la
+rm -f $RPM_BUILD_ROOT/%{_libdir}/python?.?/site-packages/_audit.a
+rm -f $RPM_BUILD_ROOT/%{_libdir}/python?.?/site-packages/_audit.la
+rm -f $RPM_BUILD_ROOT/%{_libdir}/python?.?/site-packages/_auparse.a
+rm -f $RPM_BUILD_ROOT/%{_libdir}/python?.?/site-packages/_auparse.la
+rm -f $RPM_BUILD_ROOT/%{_libdir}/python?.?/site-packages/auparse.a
+rm -f $RPM_BUILD_ROOT/%{_libdir}/python?.?/site-packages/auparse.la
+
+# On platforms with 32 & 64 bit libs, we need to coordinate the timestamp
+touch -r ./audit.spec $RPM_BUILD_ROOT/etc/libaudit.conf
+touch -r ./audit.spec $RPM_BUILD_ROOT/usr/share/man/man5/libaudit.conf.5.gz
+
+%ifnarch ppc ppc64
+%check
+make check
+%endif
+
+%clean
+rm -rf $RPM_BUILD_ROOT
+
+%post libs -p /sbin/ldconfig
+
+%post
+# Copy default rules into place on new installation
+if [ ! -e /etc/audit/audit.rules ] ; then
+ cp /etc/audit/rules.d/audit.rules /etc/audit/audit.rules
+fi
+%if %{WITH_SYSTEMD}
+%systemd_post auditd.service
+%else
+/sbin/chkconfig --add auditd
+%endif
+
+%preun
+%if %{WITH_SYSTEMD}
+/sbin/service auditd stop > /dev/null 2>&1
+%systemd_preun auditd.service
+%else
+if [ $1 -eq 0 ]; then
+ /sbin/service auditd stop > /dev/null 2>&1
+ /sbin/chkconfig --del auditd
+fi
+%endif
+
+%postun libs -p /sbin/ldconfig
+
+%postun
+if [ $1 -ge 1 ]; then
+ /sbin/service auditd condrestart > /dev/null 2>&1 || :
+fi
+
+%files libs
+%defattr(-,root,root,-)
+%attr(755,root,root) /%{_lib}/libaudit.so.1*
+%attr(755,root,root) /%{_lib}/libauparse.*
+%config(noreplace) %attr(640,root,root) /etc/libaudit.conf
+%{_mandir}/man5/libaudit.conf.5.gz
+
+%files libs-devel
+%defattr(-,root,root,-)
+%doc contrib/skeleton.c contrib/plugin
+%{_libdir}/libaudit.so
+%{_libdir}/libauparse.so
+%{_includedir}/libaudit.h
+%{_includedir}/auparse.h
+%{_includedir}/auparse-defs.h
+%{_mandir}/man3/*
+
+%files libs-static
+%defattr(-,root,root,-)
+%{_libdir}/libaudit.a
+%{_libdir}/libauparse.a
+
+%files libs-python
+%defattr(-,root,root,-)
+%attr(755,root,root) %{python_sitearch}/_audit.so
+%attr(755,root,root) %{python_sitearch}/auparse.so
+%{python_sitearch}/audit.py*
+
+%files
+%defattr(-,root,root,-)
+%doc README COPYING ChangeLog contrib/capp.rules contrib/nispom.rules contrib/lspp.rules contrib/stig.rules init.d/auditd.cron
+%attr(644,root,root) %{_mandir}/man8/audispd.8.gz
+%attr(644,root,root) %{_mandir}/man8/auditctl.8.gz
+%attr(644,root,root) %{_mandir}/man8/auditd.8.gz
+%attr(644,root,root) %{_mandir}/man8/aureport.8.gz
+%attr(644,root,root) %{_mandir}/man8/ausearch.8.gz
+%attr(644,root,root) %{_mandir}/man8/autrace.8.gz
+%attr(644,root,root) %{_mandir}/man8/aulast.8.gz
+%attr(644,root,root) %{_mandir}/man8/aulastlog.8.gz
+%attr(644,root,root) %{_mandir}/man8/auvirt.8.gz
+%attr(644,root,root) %{_mandir}/man8/augenrules.8.gz
+%attr(644,root,root) %{_mandir}/man8/ausyscall.8.gz
+%attr(644,root,root) %{_mandir}/man7/audit.rules.7.gz
+%attr(644,root,root) %{_mandir}/man5/auditd.conf.5.gz
+%attr(644,root,root) %{_mandir}/man5/audispd.conf.5.gz
+%attr(644,root,root) %{_mandir}/man5/ausearch-expression.5.gz
+%attr(750,root,root) /sbin/auditctl
+%attr(750,root,root) /sbin/auditd
+%attr(755,root,root) /sbin/ausearch
+%attr(755,root,root) /sbin/aureport
+%attr(750,root,root) /sbin/autrace
+%attr(750,root,root) /sbin/audispd
+%attr(750,root,root) /sbin/augenrules
+%attr(755,root,root) %{_bindir}/aulast
+%attr(755,root,root) %{_bindir}/aulastlog
+%attr(755,root,root) %{_bindir}/ausyscall
+%attr(755,root,root) %{_bindir}/auvirt
+%if %{WITH_SYSTEMD}
+%attr(640,root,root) %{_unitdir}/auditd.service
+%attr(750,root,root) %dir %{_libexecdir}/initscripts/legacy-actions/auditd
+%attr(750,root,root) %{_libexecdir}/initscripts/legacy-actions/auditd/resume
+%attr(750,root,root) %{_libexecdir}/initscripts/legacy-actions/auditd/rotate
+%attr(750,root,root) %{_libexecdir}/initscripts/legacy-actions/auditd/stop
+%attr(750,root,root) %{_libexecdir}/initscripts/legacy-actions/auditd/restart
+%attr(750,root,root) %{_libexecdir}/initscripts/legacy-actions/auditd/condrestart
+%else
+%attr(755,root,root) /etc/rc.d/init.d/auditd
+%config(noreplace) %attr(640,root,root) /etc/sysconfig/auditd
+%endif
+%attr(750,root,root) %dir %{_var}/log/audit
+%attr(750,root,root) %dir /etc/audit
+%attr(750,root,root) %dir /etc/audit/rules.d
+%attr(750,root,root) %dir /etc/audisp
+%attr(750,root,root) %dir /etc/audisp/plugins.d
+%config(noreplace) %attr(640,root,root) /etc/audit/auditd.conf
+%config(noreplace) %attr(640,root,root) /etc/audit/rules.d/audit.rules
+%config(noreplace) %attr(640,root,root) /etc/audisp/audispd.conf
+%config(noreplace) %attr(640,root,root) /etc/audisp/plugins.d/af_unix.conf
+%config(noreplace) %attr(640,root,root) /etc/audisp/plugins.d/syslog.conf
+
+%files -n audispd-plugins
+%defattr(-,root,root,-)
+%attr(644,root,root) %{_mandir}/man8/audispd-zos-remote.8.gz
+%attr(644,root,root) %{_mandir}/man5/zos-remote.conf.5.gz
+%config(noreplace) %attr(640,root,root) /etc/audisp/plugins.d/audispd-zos-remote.conf
+%config(noreplace) %attr(640,root,root) /etc/audisp/zos-remote.conf
+%attr(750,root,root) /sbin/audispd-zos-remote
+%config(noreplace) %attr(640,root,root) /etc/audisp/audisp-remote.conf
+%config(noreplace) %attr(640,root,root) /etc/audisp/plugins.d/au-remote.conf
+%attr(750,root,root) /sbin/audisp-remote
+%attr(700,root,root) %dir %{_var}/spool/audit
+%attr(644,root,root) %{_mandir}/man5/audisp-remote.conf.5.gz
+%attr(644,root,root) %{_mandir}/man8/audisp-remote.8.gz
+
+%changelog
+* Thu Oct 03 2013 Steve Grubb <sgrubb@redhat.com> 2.3.2-3
+resolves: #828495 - semanage port should generate an audit event
+
+* Thu Aug 29 2013 Steve Grubb <sgrubb@redhat.com> 2.3.2-2
+resolves: #991056 - ausearch ignores USER events with -ua option
+
+* Mon Jul 29 2013 Steve Grubb <sgrubb@redhat.com> 2.3.2-1
+- New upstream bugfix/enhancement release
+resolves: #982112 Add delay between stopping and starting auditd
+
+* Wed Jul 10 2013 Steve Grubb <sgrubb@redhat.com> 2.3.1-4
+resolves: #982112 Add delay between stopping and starting auditd
+
+* Wed Jul 03 2013 Steve Grubb <sgrubb@redhat.com> 2.3.1-3
+- Remove prelude support
+
+* Fri May 31 2013 Steve Grubb <sgrubb@redhat.com> 2.3.1-2
+- Fix unknown lvalue in auditd.service (#969345)
+
+* Thu May 30 2013 Steve Grubb <sgrubb@redhat.com> 2.3.1-1
+- New upstream bugfix/enhancement release
+
+* Fri May 03 2013 Steve Grubb <sgrubb@redhat.com> 2.3-2
+- If no rules exist, copy shipped rules into place
+
+* Tue Apr 30 2013 Steve Grubb <sgrubb@redhat.com> 2.3-1
+- New upstream bugfix release
+
+* Thu Mar 21 2013 Steve Grubb <sgrubb@redhat.com> 2.2.3-2
+- Fix clone syscall interpretation
+
+* Tue Mar 19 2013 Steve Grubb <sgrubb@redhat.com> 2.2.3-1
+- New upstream bugfix release
+
+* Wed Feb 13 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.2.2-5
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
+
+* Wed Jan 16 2013 Steve Grubb <sgrubb@redhat.com> 2.2.2-4
+- Don't make auditd.service file executable (#896113)
+
+* Fri Jan 11 2013 Steve Grubb <sgrubb@redhat.com> 2.2.2-3
+- Do not own /usr/lib64/audit
+
+* Wed Dec 12 2012 Steve Grubb <sgrubb@redhat.com> 2.2.2-2
+- New upstream release
+
+* Wed Jul 18 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.2.1-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
+
+* Fri Mar 23 2012 Steve Grubb <sgrubb@redhat.com> 2.2.1-1
+- New upstream release
+
+* Thu Mar 1 2012 Steve Grubb <sgrubb@redhat.com> 2.2-1
+- New upstream release
+
+* Thu Jan 12 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.1.3-5
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
+
+* Thu Sep 15 2011 Adam Williamson <awilliam@redhat.com> 2.1.3-4
+- add in some systemd scriptlets that were missed, including one which
+ will cause auditd to be enabled on upgrade from pre-systemd builds
+
+* Wed Sep 14 2011 Steve Grubb <sgrubb@redhat.com> 2.1.3-3
+- Enable by default (#737060)
+
+* Tue Aug 30 2011 Steve Grubb <sgrubb@redhat.com> 2.1.3-2
+- Correct misplaced ifnarch (#734359)
+
+* Mon Aug 15 2011 Steve Grubb <sgrubb@redhat.com> 2.1.3-1
+- New upstream release
+
+* Tue Jul 26 2011 Jóhann B. Guðmundsson <johannbg@gmail.com> - 2.1.2-2
+- Introduce systemd unit file, drop SysV support
+
+* Sat Jun 11 2011 Steve Grubb <sgrubb@redhat.com> 2.1.2-1
+- New upstream release
+
+* Wed Apr 20 2011 Steve Grubb <sgrubb@redhat.com> 2.1.1-1
+- New upstream release
+
+* Tue Mar 29 2011 Steve Grubb <sgrubb@redhat.com> 2.1-1
+- New upstream release
+
+* Mon Feb 07 2011 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.0.6-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
+
+* Fri Feb 04 2011 Steve Grubb <sgrubb@redhat.com> 2.0.6-1
+- New upstream release
+
+* Thu Jan 20 2011 Karsten Hopp <karsten@redhat.com> 2.0.5-2
+- bump and rebuild as 2.0.5-1 was erroneously linked with python-2.6 on ppc
+
+* Tue Nov 02 2010 Steve Grubb <sgrubb@redhat.com> 2.0.5-1
+- New upstream release
+
+* Wed Jul 21 2010 David Malcolm <dmalcolm@redhat.com> - 2.0.4-4
+- Rebuilt for https://fedoraproject.org/wiki/Features/Python_2.7/MassRebuild
+
+* Tue Feb 16 2010 Adam Jackson <ajax@redhat.com> 2.0.4-3
+- audit-2.0.4-add-needed.patch: Fix FTBFS for --no-add-needed
+
+* Fri Jan 29 2010 Steve Grubb <sgrubb@redhat.com> 2.0.4-2
+- Split out static libs (#556039)
+
+* Tue Dec 08 2009 Steve Grubb <sgrubb@redhat.com> 2.0.4-1
+- New upstream release
+
+* Sat Oct 17 2009 Steve Grubb <sgrubb@redhat.com> 2.0.3-1
+- New upstream release
+
+* Fri Oct 16 2009 Steve Grubb <sgrubb@redhat.com> 2.0.2-1
+- New upstream release
+
+* Mon Sep 28 2009 Steve Grubb <sgrubb@redhat.com> 2.0.1-1
+- New upstream release
+
+* Fri Aug 21 2009 Steve Grubb <sgrubb@redhat.com> 2.0-3
+- New upstream release