diff --git a/.cvsignore b/.cvsignore
index 8e57861..a162dcc 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -3,3 +3,4 @@ rrdtool-1.2.13.tar.gz
 php4-svn839.tar.gz
 rrdtool-1.2.15.tar.gz
 rrdtool-1.2.17.tar.gz
+rrdtool-1.2.18.tar.gz
diff --git a/rrdtool.spec b/rrdtool.spec
index 8d57408..12e7549 100644
--- a/rrdtool.spec
+++ b/rrdtool.spec
@@ -6,7 +6,7 @@
 
 Summary: Round Robin Database Tool to store and display time-series data
 Name: rrdtool
-Version: 1.2.17
+Version: 1.2.18
 Release: 1%{?dist}
 License: GPL
 Group: Applications/Databases
@@ -269,6 +269,12 @@ find examples/ -type f -exec chmod 0644 {} \;
 %endif
 
 %changelog
+* Tue Jan 23 2007 Jarod Wilson <jwilson@redhat.com> 1.2.18-1
+- New upstream release
+
+* Mon Jan 22 2007 Jarod Wilson <jwilson@redhat.com> 1.2.17-1
+- New upstream release
+
 * Tue Jan 02 2007 Jarod Wilson <jwilson@redhat.com> 1.2.15-9
 - Fix crash with long error strings (upstream
   changesets 929 and 935)
diff --git a/sources b/sources
index 6603120..28e318b 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
 20f70c46a3643ebc51d7b8562d8af9b2  php4-svn839.tar.gz
-ac743fc7f58a195854fff9d70517b193  rrdtool-1.2.17.tar.gz
+0c116d031275b7e0da1f8326d52d097d  rrdtool-1.2.18.tar.gz