diff --git a/.cvsignore b/.cvsignore
index b375638..dfeb482 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-task-1.8.1.tar.gz
+task-1.9.0.tar.gz
diff --git a/Makefile b/Makefile
index 8e95a60..ad02dfb 100644
--- a/Makefile
+++ b/Makefile
@@ -4,7 +4,7 @@ NAME := task
 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 $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
+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))
diff --git a/branch b/branch
new file mode 100644
index 0000000..06de2d2
--- /dev/null
+++ b/branch
@@ -0,0 +1 @@
+F-12
diff --git a/import.log b/import.log
index 8bbee16..b545c0d 100644
--- a/import.log
+++ b/import.log
@@ -3,3 +3,9 @@ task-1_7_1-1_fc10:HEAD:task-1.7.1-1.fc10.src.rpm:1244551419
 task-1_7_1-2_fc10:HEAD:task-1.7.1-2.fc10.src.rpm:1244565493
 task-1_8_0-1_fc10:HEAD:task-1.8.0-1.fc10.src.rpm:1249997682
 task-1_8_1-1_fc10:HEAD:task-1.8.1-1.fc10.src.rpm:1250806897
+task-1_8_2-1_fc10:F-12:task-1.8.2-1.fc10.src.rpm:1252318919
+task-1_8_3-1_fc10:F-12:task-1.8.3-1.fc10.src.rpm:1256163996
+task-1_8_4-1_fc11:F-12:task-1.8.4-1.fc11.src.rpm:1258468591
+task-1_8_5-1_fc11:F-12:task-1.8.5-1.fc11.src.rpm:1260056647
+task-1_8_5-2_fc11:F-12:task-1.8.5-2.fc11.src.rpm:1260063445
+task-1_9_0-1_fc12:F-12:task-1.9.0-1.fc12.src.rpm:1266888580
diff --git a/sources b/sources
index baad3d0..b42cbf6 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-c21590baf207f83cf5448351c3ac4ffb  task-1.8.1.tar.gz
+b9c12f60ff509c1ce5c6292041789baa  task-1.9.0.tar.gz
diff --git a/task.spec b/task.spec
index ac5b0bf..4d378d0 100644
--- a/task.spec
+++ b/task.spec
@@ -1,5 +1,5 @@
 Name:           task
-Version:        1.8.1
+Version:        1.9.0
 Release:        1%{?dist}
 Summary:        A command-line to do list manager
 
@@ -17,7 +17,7 @@ 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.
+options, multi-user file locking, recurring tasks.
 
 %prep
 %setup -q
@@ -40,15 +40,35 @@ rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(-,root,root,-)
-%doc AUTHORS ChangeLog COPYING NEWS README scripts i18n
+%doc AUTHORS ChangeLog COPYING NEWS README scripts i18n doc/rc
 %{_bindir}/task
 %{_mandir}/man1/task.1.gz
 %{_mandir}/man5/taskrc.5.gz
 %{_mandir}/man5/task-tutorial.5.gz
+%{_mandir}/man5/task-color.5.gz
+%{_mandir}/man5/task-faq.5.gz
 %config(noreplace) %{_sysconfdir}/bash_completion.d
 
 
 %changelog
+* Mon Feb 22 2010 Federico Hernandez <ultrafredde@gmail.com> - 1.9.0-1
+  Intial RPM for task beta release 1.9.0
+* Mon Feb 15 2010 Federico Hernandez <ultrafredde@gmail.com> - 1.9.0.beta3-1
+  Intial RPM for task beta release 1.9.0.beta3
+* Mon Feb 08 2010 Federico Hernandez <ultrafredde@gmail.com> - 1.9.0.beta2-1
+  Intial RPM for task beta release 1.9.0.beta2
+* Wed Feb 03 2010 Federico Hernandez <ultrafredde@gmail.com> - 1.9.0.beta1-1
+  Intial RPM for task beta release 1.9.0.beta1
+* Sat Dec 05 2009 Federico Hernandez <ultrafredde@gmail.com> - 1.8.5-2
+  Fixed wrong ChangeLog file
+* Sat Dec 05 2009 Federico Hernandez <ultrafredde@gmail.com> - 1.8.5-1
+  Intial RPM for task bugfix release 1.8.5
+* Tue Nov 17 2009 Federico Hernandez <ultrafredde@gmail.com> - 1.8.4-1
+  Intial RPM for task bugfix release 1.8.4
+* Wed Oct 21 2009 Federico Hernandez <ultrafredde@gmail.com> - 1.8.3-1
+  Intial RPM for task bugfix release 1.8.3
+* Mon Sep 07 2009 Federico Hernandez <ultrafredde@gmail.com> - 1.8.2-1
+  Intial RPM for task bugfix release 1.8.2
 * Thu Aug 20 2009 Federico Hernandez <ultrafredde@gmail.com> - 1.8.1-1
   Intial RPM for task bugfix release 1.8.1
 * Tue Jul 21 2009 Federico Hernandez <ultrafredde@gmail.com> - 1.8.0-1
@@ -60,12 +80,12 @@ rm -rf $RPM_BUILD_ROOT
 * 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.
+  Fixed inclusion of manpages.
 * Tue Jun 08 2009 Federico Hernandez <ultrafredde@gmail.com> - 1.7.1-1
-- Initial RPM for bugfix release 1.7.1.
-- Updated references to new project homepage in spec file. 
+  Initial RPM for bugfix release 1.7.1.
+  Updated references to new project homepage in spec file. 
 * Tue May 19 2009 Federico Hernandez <ultrafredde@gmail.com> - 1.7.0-2
-- Changed license to GPLv2+ and removed Requires macro.
-- See https://bugzilla.redhat.com/show_bug.cgi?id=501498
+  Changed license to GPLv2+ and removed Requires macro.
+  See https://bugzilla.redhat.com/show_bug.cgi?id=501498
 * Tue May 19 2009 Federico Hernandez <ultrafredde@gmail.com> - 1.7.0-1
-- Initial RPM.
+  Initial RPM.