diff --git a/.cvsignore b/.cvsignore
index e69de29..de3ef7c 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -0,0 +1 @@
+olpc-netutils-0.4.tar.bz2
diff --git a/import.log b/import.log
new file mode 100644
index 0000000..9e6d44b
--- /dev/null
+++ b/import.log
@@ -0,0 +1 @@
+olpc-netutils-0_4-2_fc9:HEAD:olpc-netutils-0.4-2.fc9.src.rpm:1218420517
diff --git a/olpc-netutils-0.4-preserve-timestamps.patch b/olpc-netutils-0.4-preserve-timestamps.patch
new file mode 100644
index 0000000..9904239
--- /dev/null
+++ b/olpc-netutils-0.4-preserve-timestamps.patch
@@ -0,0 +1,15 @@
+--- olpc-netutils-0.4/Makefile.build	Mon Jul 14 12:19:48 2008
++++ olpc-netutils-0.4/Makefile.build	Fri Aug  8 17:14:09 2008
+@@ -12,10 +12,10 @@
+ # install targets
+ 
+ $(DESTDIR)/usr/%: usr/%
+-	install -D $< $@
++	install -p -D $< $@
+ 
+ $(foreach d,$(shell find $(OVERLAYS) -type d),$(DESTDIR)/$d):
+-	install -D -d $@
++	install -p -D -d $@
+ 
+ install: $(foreach f,$(shell find $(OVERLAYS) -not -type d),$(DESTDIR)/$f)
+ 
diff --git a/olpc-netutils.spec b/olpc-netutils.spec
new file mode 100644
index 0000000..12fe95b
--- /dev/null
+++ b/olpc-netutils.spec
@@ -0,0 +1,72 @@
+Name:           olpc-netutils
+Version:        0.4
+Release:        2%{?dist}
+Summary:        OLPC network utilities
+
+Group:          System Environment/Base
+License:        GPLv2+
+URL:            http://wiki.laptop.org/go/Olpc-netutils
+Source0:        http://dev.laptop.org/~mstone/releases/SOURCES/%{name}-%{version}.tar.bz2
+# Submitted olpc-netutils-0.4-preserve-timestamps.patch upstream via email on Fri Aug 08 2008
+Patch0:         olpc-netutils-0.4-preserve-timestamps.patch
+BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+
+BuildArch:      noarch
+
+Requires:       python
+Requires:       dbus-python
+
+Requires:       coreutils
+Requires:       procps
+Requires:       util-linux
+
+Requires:       net-tools
+Requires:       wireless-tools
+Requires:       avahi-tools
+
+Requires:       iputils
+Requires:       iptables
+
+Requires:       /sbin/modprobe
+Requires:       /bin/awk
+Requires:       /bin/grep
+
+
+%description
+olpc-netutils is a GPL-licensed collection of scripts for logging network
+status information on OLPC XOs.
+
+
+%prep
+%setup -q
+%patch0 -p1
+
+
+%build
+make -f Makefile.build %{?_smp_mflags}
+
+
+%install
+rm -rf $RPM_BUILD_ROOT
+make -f Makefile.build install DESTDIR=$RPM_BUILD_ROOT
+
+
+%clean
+rm -rf $RPM_BUILD_ROOT
+
+
+%files
+%defattr(-,root,root,-)
+%doc COPYING README AUTHORS
+%{_bindir}/*
+
+
+%changelog
+* Fri Aug 08 2008 Robin Norwood <rnorwood@redhat.com> - 0.4-2
+- Apply patch and fix change log based on package review feedback
+
+* Tue Jul 29 2008 Robin Norwood <rnorwood@redhat.com> - 0.4-1
+- Spec for F9 package review
+
+* Wed Jul 02 2008 Michael Stone <michael@laptop.org> - 0.2-1
+- Initial release of this spec.
diff --git a/sources b/sources
index e69de29..9af9246 100644
--- a/sources
+++ b/sources
@@ -0,0 +1 @@
+eb66bdf93e1eed8ae822a584abbc9082  olpc-netutils-0.4.tar.bz2