diff --git a/.cvsignore b/.cvsignore
deleted file mode 100644
index e69de29..0000000
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..b83c41c
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1 @@
+uperf-1.0.3-beta.tar.gz
diff --git a/Makefile b/Makefile
deleted file mode 100644
index 0f9f65a..0000000
--- a/Makefile
+++ /dev/null
@@ -1,21 +0,0 @@
-# Makefile for source rpm: uperf
-# $Id$
-NAME := uperf
-SPECFILE = $(firstword $(wildcard *.spec))
-
-define find-makefile-common
-for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
-endef
-
-MAKEFILE_COMMON := $(shell $(find-makefile-common))
-
-ifeq ($(MAKEFILE_COMMON),)
-# attept a checkout
-define checkout-makefile-common
-test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
-endef
-
-MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
-endif
-
-include $(MAKEFILE_COMMON)
diff --git a/sources b/sources
index e69de29..ea2f620 100644
--- a/sources
+++ b/sources
@@ -0,0 +1 @@
+428035a33729a877f1ecd4ced8911a6f  uperf-1.0.3-beta.tar.gz
diff --git a/uperf.spec b/uperf.spec
new file mode 100644
index 0000000..596b0a4
--- /dev/null
+++ b/uperf.spec
@@ -0,0 +1,57 @@
+Summary:        Network performance tool with modelling and replay support
+Name:           uperf
+Version:        1.0.3
+Release:        0.3.beta%{?dist}
+License:        GPLv3
+Group:          Applications/Internet
+URL:            http://www.uperf.org/
+Source0:        http://downloads.sourceforge.net/uperf/uperf-%{version}-beta.tar.gz
+BuildRequires:  lksctp-tools-devel openssl-devel
+BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root
+%description
+Network performance tool that supports modelling and replay of various
+networking patterns.
+
+%prep
+%setup -q -n %{name}-%{version}-beta
+find src -type f -print0 | xargs --null chmod 0644
+find workloads -type f -print0 | xargs --null chmod 0644
+chmod 0644 AUTHORS ChangeLog COPYING README
+
+%build
+%configure           \
+    --enable-cpc     \
+    --enable-netstat \
+    --enable-udp     \
+    --enable-sctp    \
+    --enable-ssl
+%{__make} %{?_smp_mflags}
+
+%install
+%{__rm} -rf %{buildroot}
+%{__make} install DESTDIR=%{buildroot}
+
+# Move stuff to own subdir
+%{__install} -d -m 0755 %{buildroot}%{_datadir}/%{name}
+%{__install} -p -m 0644 %{buildroot}%{_datadir}/*.xml %{buildroot}%{_datadir}/%{name}
+%{__rm} -rf %{buildroot}%{_datadir}/*.xml %{buildroot}%{_datadir}/doc
+
+%clean
+%{__rm} -rf %{buildroot}
+
+%files
+%defattr(-, root, root, -)
+%doc AUTHORS ChangeLog COPYING README
+%{_bindir}/%{name}
+%{_datadir}/%{name}
+
+%changelog
+* Thu Mar 18 2010 Terje Rosten <terje.rosten@ntnu.no> - 1.0.3-0.3.beta
+- move workloads files
+
+* Thu Mar 18 2010 Terje Rosten <terje.rosten@ntnu.no> - 1.0.3-0.2.beta
+- don't ship pem files
+
+* Mon Feb  1 2010 Terje Rosten <terje.rosten@ntnu.no> - 1.0.3-0.1.beta
+- initial build
+