diff --git a/.gitignore b/.gitignore
index 3142045..ff441c4 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,3 +5,10 @@ x86_64
 /*.rpm
 /.build*.log
 /noarch
+<<<<<<< HEAD
+=======
+/httpd-2.2.19.tar.gz
+/httpd-2.2.20.tar.gz
+/httpd-2.2.21.tar.bz2
+/clog
+>>>>>>> f93baaa... update to 2.2.21
diff --git a/httpd.spec b/httpd.spec
index 0d55ae6..0c1a376 100644
--- a/httpd.spec
+++ b/httpd.spec
@@ -7,10 +7,10 @@
 
 Summary: Apache HTTP Server
 Name: httpd
-Version: 2.2.19
-Release: 2%{?dist}
+Version: 2.2.21
+Release: 1%{?dist}
 URL: http://httpd.apache.org/
-Source0: http://www.apache.org/dist/httpd/httpd-%{version}.tar.gz
+Source0: http://www.apache.org/dist/httpd/httpd-%{version}.tar.bz2
 Source1: index.html
 Source3: httpd.logrotate
 Source4: httpd.init
@@ -494,6 +494,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/httpd/build/*.sh
 
 %changelog
+* Tue Sep 13 2011 Joe Orton <jorton@redhat.com> - 2.2.21-1
+- update to 2.2.21
+
 * Wed Jul 20 2011 Jan Kaluza <jkaluza@redhat.com> - 2.2.19-2
 - fix #716621 - suexec now works without setuid bit
 - fix #689091 - backported patch from 2.3 branch to support IPv6 in logresolve
diff --git a/sources b/sources
index 78146ca..9787c07 100644
--- a/sources
+++ b/sources
@@ -1 +1,5 @@
+<<<<<<< HEAD
 e9f5453e1e4d7aeb0e7ec7184c6784b5  httpd-2.2.19.tar.gz
+=======
+1696ae62cd879ab1d4dd9ff021a470f2  httpd-2.2.21.tar.bz2
+>>>>>>> f93baaa... update to 2.2.21