diff --git a/.cvsignore b/.cvsignore
index e69de29..8f4daa8 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -0,0 +1 @@
+linux-iscsi-3.6.0.2.tgz
diff --git a/iscsi-initiator-utils.spec b/iscsi-initiator-utils.spec
new file mode 100644
index 0000000..e67cb79
--- /dev/null
+++ b/iscsi-initiator-utils.spec
@@ -0,0 +1,130 @@
+Summary: iSCSI daemon and utility programs
+Name: iscsi-initiator-utils
+Version: 3.6.0.2
+Release: 0.1
+Source0: http://prdownloads.sourceforge.net/linux-iscsi/linux-iscsi-%{version}.tgz
+Patch0: linux-iscsi-3.6.0.2-redhatify.patch
+Group: System Environment/Daemons
+License: GPL
+URL: http://linux-iscsi.sourceforge.net/
+Buildroot: %{_tmppath}/%{name}-root
+Requires: kernel >= 2.4.21-15.0.3.EL
+Prereq: /sbin/chkconfig
+ExcludeArch: s390 s390x
+Obsoletes: iscsi
+
+%description
+The iscsi package provides the server daemon for the iSCSI protocol,
+as well as the utility programs used to manage it. iSCSI is a protocol
+for distributed disk access using SCSI commands sent over Internet
+Protocol networks.
+
+%prep
+%setup -q -n %{name}-%{version} -c
+cd linux-iscsi-%{version}
+%patch0 -p1 -b .redhatify
+
+%build
+cd linux-iscsi-%{version}
+make daemons utils
+
+%install
+cd linux-iscsi-%{version}
+
+rm -rf $RPM_BUILD_ROOT
+mkdir -p $RPM_BUILD_ROOT{/sbin,/usr/sbin,/dev/iscsi}
+mkdir -p ${RPM_BUILD_ROOT}%{_mandir}/{man1,man5,man8}
+mkdir -p $RPM_BUILD_ROOT/etc/rc.d/init.d
+install -s -m 755 iscsid iscsi-device iscsi-iname iscsi-ls $RPM_BUILD_ROOT/sbin
+# iscsigt I think is development-use-only, and the scripts
+# should not be needed in a complete integration
+install -s -m 755 iscsi-device $RPM_BUILD_ROOT/usr/sbin
+# iscsi-mountall is not necessary because we're using _netdev in /etc/fstab
+install -m 755 iscsi-umountall $RPM_BUILD_ROOT/sbin
+install -m 644 iscsi-ls.1 $RPM_BUILD_ROOT/%{_mandir}/man1
+install -m 644 iscsid.8 $RPM_BUILD_ROOT/%{_mandir}/man8
+install -m 644 iscsi.conf.5 $RPM_BUILD_ROOT/%{_mandir}/man5
+install -m 755 rc.iscsi $RPM_BUILD_ROOT/etc/rc.d/init.d/iscsi
+install -m 644 iscsi.conf $RPM_BUILD_ROOT/etc
+echo 'GenerateName=yes' > initiatorname.iscsi
+install -m 600 initiatorname.iscsi $RPM_BUILD_ROOT/etc
+
+%clean
+rm -rf $RPM_BUILD_ROOT
+
+%post
+/sbin/chkconfig --add iscsi
+
+%preun
+if [ "$1" = "0" ]; then
+    /sbin/chkconfig --del iscsi
+fi
+
+
+%files
+%defattr(-,root,root)
+%config /etc/rc.d/init.d/iscsi
+%attr(600,root,root) %config(noreplace) /etc/initiatorname.iscsi
+%attr(600,root,root) %config(noreplace) /etc/iscsi.conf
+%doc linux-iscsi-%{version}/README
+/sbin/*
+/usr/sbin/*
+%{_mandir}/*/*
+
+%changelog
+* Wed Jul 14 2004 AJ Lewis <alewis@redhat.com> 3.6.0.2-0.1
+- update to 3.6.0.2 upstream
+- add iscsi-ls to installed binaries
+- add iscsi-ls.1 manpage to man1
+- remove /dev/iscsi reference (no longer used)
+
+* Fri Feb 13 2004 Elliot Lee <sopwith@redhat.com>
+- rebuilt
+
+* Thu Jun 05 2003 Elliot Lee <sopwith@redhat.com>
+- rebuilt
+
+* Mon Feb 03 2003 Michael K. Johnson <johnsonm@redhat.com> 3.1.0.3-3
+- rebuild, 3.1.0.3-3
+
+* Mon Nov 11 2002 Michael K. Johnson <johnsonm@redhat.com>
+- Fixed typo in initscript to allow to function
+
+* Thu Oct 17 2002 Michael K. Johnson <johnsonm@redhat.com>
+- update to 3.1.0.3 for draft 16 compliance
+- /etc/initiatorname.iscsi should be mode 600
+- C++ all gone, no need for libstdc++ static link
+
+* Wed Aug 14 2002 Bob Matthews <bmatthews@redhat.com>
+- fix perms on /etc/iscsi.conf
+
+* Mon Jul 15 2002 Michael K. Johnson <johnsonm@redhat.com>
+- add status function
+
+* Thu May 02 2002 Michael K. Johnson <johnsonm@redhat.com>
+- hack to link statically against libstdc++ so /sbin does not depend on /usr
+
+* Wed Apr 10 2002 Michael K. Johnson <johnsonm@redhat.com>
+- update to 2.1.0.20
+
+* Fri Oct 26 2001 Than Ngo <than@redhat.com> 2.0.1.8-3
+- cleanup startup script
+- add excludearch s390 s390x
+
+* Tue Aug 28 2001 Michael K. Johnson <johnsonm@redhat.com>
+- clean up shutdown (#52440)
+
+* Mon Aug 13 2001 Michael K. Johnson <johnsonm@redhat.com>
+- update to 2.0.1.8 for draft 6 compliance
+
+* Mon Aug 13 2001 Bob Matthews <bmatthews@redhat.com>
+- fix typo in initscripts (#51585)
+
+* Tue Jul 31 2001 Bill Nottingham <notting@redhat.com>
+- fix up initscript output (#50502)
+
+* Wed Jul 25 2001 Jeremy Katz <katzj@redhat.com>
+- source /etc/init.d/functions in the initscript
+
+* Tue Jul 24 2001 Michael K. Johnson <johnsonm@redhat.com>
+- initial packaging
diff --git a/sources b/sources
index e69de29..9524f5c 100644
--- a/sources
+++ b/sources
@@ -0,0 +1 @@
+8e517d223402141289847051c87366db  linux-iscsi-3.6.0.2.tgz