diff --git a/.cvsignore b/.cvsignore
index e86ecb7..b9a0b8f 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-SimPy-1.7.1.tar.gz
+SimPy-1.8.tar.gz
diff --git a/python-simpy.spec b/python-simpy.spec
index de56b5d..5f5c309 100644
--- a/python-simpy.spec
+++ b/python-simpy.spec
@@ -1,9 +1,10 @@
 %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 %define pkgname SimPy
+%define alphatag .rc1
 
 Name:		python-simpy
-Version:	1.7.1
-Release:	5%{?dist}
+Version:	1.8
+Release:	0.1%{alphatag}%{?dist}
 Summary:	Python simulation framework
 Group:		Development/Languages
 License:	LGPL
@@ -38,7 +39,10 @@ package contains the source code documentation.
 %prep
 %setup -q -n %{pkgname}-%{version}
 # Remove the shebangs to make rpmlint happy
-%{__sed} -i '1{\?^#!/usr/bin/env\ python$?d}' SimPy/*.py
+sed -i -e '/^#!.*python/,1D' SimPy/*.py
+
+# Remove carriage returns to make rpmlint happy
+sed -i 's/\r//' SimPy/*.py
 
 %build
 %{__python} setup.py build
@@ -58,18 +62,20 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(-,root,root,-)
 %{python_sitelib}/%{pkgname}/
 # choose html over txt files for documentation
-#%doc *.html PKG-INFO LGPLlicense_files SimPyModels
-%doc *.html PKG-INFO SimPyModels
-%doc SimPyDocs/*.html SimPyDocs/*.css
+%doc *.html PKG-INFO LGPLlicense_files SimPyModels
+%doc SimPyDocs/*.html SimPyDocs/*.css SimPyDocs/*.pdf SimPyDocs/*.xls
 %doc SimPyDocs/bankprograms SimPyDocs/images SimPyDocs/Interfacing SimPyDocs/SimGUIManual SimPyDocs/SimPlotManual SimPyDocs/SimStepManual
 
 
 %files doc
 %defattr(-,root,root)
-%doc SimPyDocs/SimPy_Sourcecode_Documentation/*
+%doc SimPyDocs/SimPy_Sourcecode_Documentation/
 
 
 %changelog
+* Mon Jan 22 2007 Sarantis Paskalis <paskalis@di.uoa.gr> - 1.8-0.1.rc1
+- Update to 1.8rc.
+
 * Sat Dec  9 2006 Sarantis Paskalis <paskalis@di.uoa.gr> - 1.7.1-5
 - Rebuild for rawhide.
 
diff --git a/sources b/sources
index 2f9c5d7..e5efe1d 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-3ec045f8d02fc1008258d00d0f97c7ff  SimPy-1.7.1.tar.gz
+e0b08a93c22328b7c3fa9ab79b468ddf  SimPy-1.8.tar.gz