diff --git a/.cvsignore b/.cvsignore
index e6b5c50..edefd8f 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-apache-couchdb-0.9.1.tar.gz
+apache-couchdb-0.10.0.tar.gz
diff --git a/couchdb.spec b/couchdb.spec
index 000a336..65c07e6 100644
--- a/couchdb.spec
+++ b/couchdb.spec
@@ -3,8 +3,8 @@
 %define couchdb_group couchdb
 %define couchdb_home %{_localstatedir}/lib/couchdb
 Name:           couchdb
-Version:        0.9.1
-Release:        2%{?dist}
+Version:        0.10.0
+Release:        1%{?dist}
 Summary:        A document database server, accessible via a RESTful JSON API
 
 Group:          Applications/Databases
@@ -14,12 +14,13 @@ Source0:        http://www.apache.org/dist/%{name}/%{version}/%{tarname}-%{versi
 Source1:        %{name}.init
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:  erlang 
+BuildRequires:  erlang
 BuildRequires:  libicu-devel 
 BuildRequires:  js-devel 
 BuildRequires:  help2man
 #BuildRequires:  libcurl-devel
 BuildRequires:  curl-devel
+
 Requires:       erlang 
 #Requires:       %{_bindir}/icu-config
 Requires:       libicu-devel
@@ -43,8 +44,8 @@ JavaScript acting as the default view definition language.
 %prep
 %setup -q -n %{tarname}-%{version}
 # Patch pid location
-sed -i 's/%localstatedir%\/run\/couchdb.pid/%localstatedir%\/run\/couchdb\/couchdb.pid/g' \
-bin/couchdb.tpl.in
+#sed -i 's/%localstatedir%\/run\/couchdb.pid/%localstatedir%\/run\/couchdb\/couchdb.pid/g' \
+#bin/couchdb.tpl.in
 
 
 %build
@@ -68,6 +69,12 @@ mkdir -p $RPM_BUILD_ROOT%{_localstatedir}/run/couchdb
 # Create /var/lib/couchdb
 mkdir -p $RPM_BUILD_ROOT%{_localstatedir}/lib/couchdb
 
+# Create /etc/couchdb/default.d
+mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/couchdb/default.d
+
+# Create /etc/couchdb/local.d
+mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/couchdb/local.d
+
 ## Use /etc/sysconfig instead of /etc/default
 mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig
 mv $RPM_BUILD_ROOT%{_sysconfdir}/default/couchdb \
@@ -113,6 +120,8 @@ fi
 %defattr(-,root,root,-)
 %doc AUTHORS BUGS CHANGES LICENSE NEWS NOTICE README THANKS
 %dir %{_sysconfdir}/couchdb
+%dir %{_sysconfdir}/couchdb/local.d
+%dir %{_sysconfdir}/couchdb/default.d
 %config(noreplace) %attr(0644, %{couchdb_user}, root) %{_sysconfdir}/couchdb/default.ini
 %config(noreplace) %attr(0644, %{couchdb_user}, root) %{_sysconfdir}/couchdb/local.ini
 #%config(noreplace) %{_sysconfdir}/default/couchdb
@@ -129,6 +138,9 @@ fi
 %dir %attr(0755, %{couchdb_user}, root) %{_localstatedir}/lib/couchdb
 
 %changelog
+* Thu Oct 15 2009 Allisson Azevedo <allisson@gmail.com> 0.10.0-1
+- Update to 0.10.0.
+
 * Sun Oct 04 2009 Rahul Sundaram <sundaram@fedoraproject.org> 0.9.1-2
 - Change url. Fixes rhbz#525949
 
diff --git a/import.log b/import.log
index 4f6ab9a..64f1af0 100644
--- a/import.log
+++ b/import.log
@@ -2,3 +2,4 @@ couchdb-0_8_1-4_fc10:HEAD:couchdb-0.8.1-4.fc10.src.rpm:1236039841
 couchdb-0_9_0-1_fc10:HEAD:couchdb-0.9.0-1.fc10.src.rpm:1241659193
 couchdb-0_9_0-2_fc10:HEAD:couchdb-0.9.0-2.fc10.src.rpm:1241742181
 couchdb-0_9_1-1_fc11:HEAD:couchdb-0.9.1-1.fc11.src.rpm:1249005969
+couchdb-0_10_0-1_fc11:HEAD:couchdb-0.10.0-1.fc11.src.rpm:1255646329
diff --git a/sources b/sources
index efb1873..98fc015 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-9583efae5adfb3f9043e970fef825561  apache-couchdb-0.9.1.tar.gz
+227886b5ecbb6bcbbdc538aac4592b0e  apache-couchdb-0.10.0.tar.gz