diff --git a/.cvsignore b/.cvsignore
index ae57674..e6887f6 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-task-1.7.1.tar.gz
+task-1.8.0.tar.gz
diff --git a/import.log b/import.log
index c59c45a..cc46583 100644
--- a/import.log
+++ b/import.log
@@ -1,3 +1,4 @@
 task-1_7_0-2_fc10:F-10:task-1.7.0-2.fc10.src.rpm:1243416007
 task-1_7_1-1_fc10:F-10:task-1.7.1-1.fc10.src.rpm:1244549329
 task-1_7_1-2_fc10:F-10:task-1.7.1-2.fc10.src.rpm:1244564097
+task-1_8_0-1_fc10:F-10:task-1.8.0-1.fc10.src.rpm:1249996577
diff --git a/sources b/sources
index 34eafab..bc4ff30 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-393baac71ab282d567e1fe4a66cae5bb  task-1.7.1.tar.gz
+a50d7a143c8a15ae3d33bb2041840da6  task-1.8.0.tar.gz
diff --git a/task.spec b/task.spec
index 6ff62ad..e74480e 100644
--- a/task.spec
+++ b/task.spec
@@ -1,6 +1,6 @@
 Name:           task
-Version:        1.7.1
-Release:        2%{?dist}
+Version:        1.8.0
+Release:        1%{?dist}
 Summary:        A command-line to do list manager
 
 Group:          Applications/Productivity
@@ -12,13 +12,12 @@ BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  ncurses-devel
 
 %description
-Task is a command-line to do list manager. It is
-scope-limited to GTD functionality and features:
-tags, colorful tabular output, reports and graphs,
-lots of commands, low-level api, abbreviations for
-all commands and options, multiuser file locking,
-recurring tasks. Task is based on ideas presented
-in the todo.sh script found on: http://todotxt.org
+Task is a command-line to do list manager. It has
+support for GTD functionality and includes the
+following features: tags, colorful tabular output,
+reports and graphs, lots of manipulation commands,
+low-level API, abbreviations for all commands and
+options, multiuser file locking, recurring tasks.
 
 %prep
 %setup -q
@@ -32,7 +31,8 @@ make %{?_smp_mflags}
 %install
 rm -rf $RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT
-
+mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/bash_completion.d
+install -m 644 -T scripts/bash/task_completion.sh $RPM_BUILD_ROOT%{_sysconfdir}/bash_completion.d/task
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -40,13 +40,23 @@ rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(-,root,root,-)
-%doc AUTHORS ChangeLog COPYING INSTALL NEWS README task_completion.sh
+%doc AUTHORS ChangeLog COPYING NEWS README scripts i18n
 %{_bindir}/task
 %{_mandir}/man1/task.1.gz
 %{_mandir}/man5/taskrc.5.gz
+%{_mandir}/man5/task-tutorial.5.gz
+%config(noreplace) %{_sysconfdir}/bash_completion.d
 
 
 %changelog
+* Tue Jul 21 2009 Federico Hernandez <ultrafredde@gmail.com> - 1.8.0-1
+  Intial RPM for task release 1.8.0
+* Mon Jul 13 2009 Federico Hernandez <ultrafredde@gmail.com> - 1.8.0.beta3-1
+  Intial RPM for task beta release 1.8.0.beta3
+* Wed Jul 08 2009 Federico Hernandez <ultrafredde@gmail.com> - 1.8.0.beta2-1
+  Intial RPM for task beta release 1.8.0.beta2
+* Tue Jul 07 2009 Federico Hernandez <ultrafredde@gmail.com> - 1.8.0.beta1-1
+  Intial RPM for task beta release 1.8.0.beta1
 * Tue Jun 08 2009 Federico Hernandez <ultrafredde@gmail.com> - 1.7.1-2
 - Fixed inclusion of manpages.
 * Tue Jun 08 2009 Federico Hernandez <ultrafredde@gmail.com> - 1.7.1-1