diff --git a/.netsniff-ng.metadata b/.netsniff-ng.metadata
new file mode 100644
index 0000000..12f74dc
--- /dev/null
+++ b/.netsniff-ng.metadata
@@ -0,0 +1 @@
+4ac8f918343b4e5bd45d751a6be7bb5abdb7c0e6 SOURCES/netsniff-ng-0.5.8-a225505.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/SPECS/netsniff-ng.spec b/SPECS/netsniff-ng.spec
new file mode 100644
index 0000000..0b79e78
--- /dev/null
+++ b/SPECS/netsniff-ng.spec
@@ -0,0 +1,63 @@
+Name:		netsniff-ng
+Version:	0.5.8
+Release:	4%{?dist}
+Summary:	Packet sniffing beast
+Group:		Applications/Internet
+License:	GPLv2
+URL:		http://netsniff-ng.org/
+Source0:        https://github.com/borkmann/netsniff-ng/archive/%{commit}/%{name}-%{version}-%{shortcommit}.tar.gz
+BuildRoot:	%(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
+BuildRequires:	ncurses-devel libnl3-devel libpcap-devel GeoIP-devel zlib-devel flex bison
+
+%description
+The netsniff-ng toolkit currently consists of the following utilities:
+
+* netsniff-ng: the zero-copy sniffer, pcap capturer and replayer itself.
+* trafgen: a high performance zero-copy network packet generator.
+* astraceroute: an autonomous system (AS) and geo-ip trace route utility.
+* ifpps: a top-like kernel networking and system statistics tool.
+* bpfc: a tiny Berkeley Packet Filter compiler supporting Linux extensions.
+
+%global commit a225505ea3fd319db87f0828ead3a653f020c4bf
+%global shortcommit %(c=%{commit}; echo ${c:0:7})
+
+%prep
+%setup -qn %{name}-%{commit}
+
+%build
+./configure
+make DISTRO=1 %{?_smp_mflags}
+
+%install
+make PREFIX="%{buildroot}" install
+
+%clean
+rm -rf $RPM_BUILD_ROOT
+
+%files
+%defattr(-, root, root, -)
+%doc AUTHORS COPYING README
+%{_sbindir}/*
+%config(noreplace) %dir %{_sysconfdir}/%{name}
+%config(noreplace) %{_sysconfdir}/%{name}/*
+%{_mandir}/man8/*
+
+%changelog
+* Mon Aug 26 2013 Daniel Borkmann <dborkman@redhat.com> - 0.5.8-4
+- GeoIP was added to RHEL7, so we can make use of that to enable
+  astraceroute and features in netsniff-ng.
+- For this we also need zlib in order to make the updater work.
+
+* Mon Aug 05 2013 Daniel Borkmann <dborkman@redhat.com> - 0.5.8-3
+- Package Wrangler feedback from Thomas Graf
+- Note: %configure does not work with upstream's build system here as CFLAGS
+  will be overwritten. Changes would need to be proposed to upstream first.
+
+* Wed Jul 31 2013 Daniel Borkmann <dborkman@redhat.com> - 0.5.8-2
+- Rebased on 0.5.8-rc2 release.
+
+* Tue Jul 23 2013 Daniel Borkmann <dborkman@redhat.com> - 0.5.8-1
+- Initial netsniff-ng spec file for RHEL, import of 0.5.8-rc1. Note that
+  RHEL packaging differs significantly from Fedora as we only do a partial
+  build and have a small fraction of dependencies that are available on
+  RHEL.