diff --git a/_service b/_service
new file mode 100644
index 0000000..05be4a1
--- /dev/null
+++ b/_service
@@ -0,0 +1,13 @@
+<?xml version="1.0" ?>
+<services>
+  <service name="download_url">
+    <param name="protocol">http</param>
+    <param name="host">curl.haxx.se</param>
+    <param name="path">/download/curl-7.21.2.tar.bz2</param>
+  </service>
+  <service name="verify_file">
+    <param name="file">_service:download_url:curl-7.21.2.tar.bz2</param>
+    <param name="verifier">sha256</param>
+    <param name="checksum">f4a632e704f28767e6bbffcc6112db0590b1c9d50d8226d706ad39632355bf21</param>
+  </service>
+</services>
diff --git a/curl-7.20.1.tar.bz2 b/curl-7.20.1.tar.bz2
deleted file mode 100644
index 9399c57..0000000
--- a/curl-7.20.1.tar.bz2
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:70664da8e2a8c84327abd10ed30d5a3fc9fa2151def9ee5b75f27e3538554e56
-size 2097637
diff --git a/curl.changes b/curl.changes
index bab915a..8f404a4 100644
--- a/curl.changes
+++ b/curl.changes
@@ -1,3 +1,45 @@
+-------------------------------------------------------------------
+Fri Oct 22 16:37:03 UTC 2010 - cristian.rodriguez@opensuse.org
+
+- Update to version  7.21.2
+	* curl -T: ignore file size of special files
+    * Added GOPHER protocol support
+    * Added mk-ca-bundle.vbs script
+    * c-ares build now requires c-ares >= 1.6.0
+    * --remote-header-name security vulnerability fixed
+    * multi: support the timeouts correctly, fixes known bug #62
+    * multi: use timeouts properly for MAX_RECV/SEND_SPEED
+    * negotiation: Wrong proxy authorization
+    * multi: avoid sending multiple complete messages
+    * cmdline: make -F type= accept ;charset=
+    * RESUME_FROM: clarify what ftp uploads do
+    * http: handle trailer headers in all chunked responses
+    * Curl_is_connected: use correct errno
+    * progress: callback for POSTs less than MAX_INITIAL_POST_SIZE
+    * Link curl and the test apps with -lrt explicitly when necessary
+    * chunky parser: only rewind stream internally if needed
+	* remote-header-name: don't output filename when NULL
+    * Curl_timeleft: avoid returning "no timeout" by mistake
+    * timeout: use the correct start value as offset
+    * FTP: fix wrong timeout trigger
+    * rtsp: avoid SIGSEGV on malformed header
+	* LDAP: Support for tunnelling queries through HTTP proxy
+    * curl_easy_duphandle: clone the c-ares handle correctly
+    * support URL containing colon without trailing port number
+    * parsedate: allow time specified without seconds
+    * curl_easy_escape: don't escape "unreserved" characters
+    * SFTP: avoid downloading negative sizes
+	* Lots of GSS/KRB FTP fixes
+	* TFTP: Work around tftpd-hpa upload bug
+	* libcurl.m4: several fixes
+	* HTTP: remove special case for 416
+    * globbing: fix crash on unballanced open brace 
+
+-------------------------------------------------------------------
+Wed Jun  2 14:12:54 UTC 2010 - lnussel@suse.de
+
+- allowing switching to nss instead of openssl via bcond
+
 -------------------------------------------------------------------
 Mon May 10 01:12:22 UTC 2010 - crrodriguez@opensuse.org
 
diff --git a/curl.spec b/curl.spec
index 1d6c565..47f6229 100644
--- a/curl.spec
+++ b/curl.spec
@@ -17,9 +17,18 @@
 
 # norootforbuild
 
+%bcond_without openssl
+%bcond_with mozilla_nss
+%bcond_without testsuite
 
 Name:           curl
-BuildRequires:  libidn-devel openldap2-devel openssl-devel pkg-config zlib-devel
+BuildRequires:  libidn-devel openldap2-devel pkg-config zlib-devel
+%if %{with openssl}
+BuildRequires:  openssl-devel
+%endif
+%if %{with mozilla_nss}
+BuildRequires:  mozilla-nss-devel
+%endif
 %if 0%{suse_version} > 930
 BuildRequires:  krb5-devel
 %else
@@ -31,8 +40,8 @@ BuildRequires:  libssh2-devel openssh
 BuildRequires:  stunnel
 %endif
 #define cvs_suffix -20090302
-Version:        7.20.1
-Release:        2
+Version:        7.21.2
+Release:        3
 AutoReqProv:    on
 # bug437293
 %ifarch ppc64
@@ -88,8 +97,15 @@ export CFLAGS="$RPM_OPT_FLAGS"
 ./configure \
 	--prefix=%{_prefix} \
 	--enable-ipv6 \
+%if %{with openssl}
 	--with-ssl \
 	--with-ca-path=/etc/ssl/certs/ \
+%else
+	--without-ssl \
+%if %{with mozilla_nss}
+	--with-nss \
+%endif
+%endif
 %if %suse_version > 930
 	--with-gssapi=/usr/lib/mit \
 %else
@@ -103,6 +119,10 @@ export CFLAGS="$RPM_OPT_FLAGS"
 ./libtool --config | grep -q link_all_deplibs=no
 # enable-hidden-symbols needs gcc4 and causes that curl exports only its API
 make %{?jobs:-j%jobs}
+
+%if %{with testsuite}
+
+%check
 cd tests
 make
 # make sure the testsuite runs don't race on MP machines in autobuild
@@ -120,6 +140,7 @@ perl ./runtests.pl -a -b$base || {
 	echo "WARNING: runtests.pl failed with code $?, continuing nevertheless"
 %endif
 }
+%endif
 
 %install
 make install DESTDIR=$RPM_BUILD_ROOT mandir=%{_mandir}