diff --git a/xmlstarlet-1.2.0.tar.bz2 b/xmlstarlet-1.2.0.tar.bz2
deleted file mode 100644
index 8f5114b..0000000
--- a/xmlstarlet-1.2.0.tar.bz2
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:02d3cc87c49957bd4590506df07d3dd597a1753b2663f5147fe8e1a822cc9f91
-size 328683
diff --git a/xmlstarlet-1.2.1.tar.bz2 b/xmlstarlet-1.2.1.tar.bz2
new file mode 100644
index 0000000..3f2d76b
--- /dev/null
+++ b/xmlstarlet-1.2.1.tar.bz2
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:014aebbe222cb06c382f7385afc89c7789144628ed13b1484da0413b4ed8aa24
+size 329503
diff --git a/xmlstarlet-backport_libxml2_2_7_8_XML_SAVE_WSNONSIG.patch b/xmlstarlet-backport_libxml2_2_7_8_XML_SAVE_WSNONSIG.patch
deleted file mode 100644
index 0083b54..0000000
--- a/xmlstarlet-backport_libxml2_2_7_8_XML_SAVE_WSNONSIG.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- src/xml_edit.c.orig	2011-06-02 08:33:48.440001384 +0200
-+++ src/xml_edit.c	2011-06-02 08:35:40.246001357 +0200
-@@ -431,7 +431,9 @@
- {
-     xmlDocPtr doc;
-     int save_options =
-+#if LIBXML_VERSION >= 20708
-         (g_ops.noblanks? 0 : XML_SAVE_WSNONSIG) |
-+#endif
-         (g_ops.preserveFormat? 0 : XML_SAVE_FORMAT) |
-         (g_ops.omit_decl? XML_SAVE_NO_DECL : 0);
-     int read_options =
diff --git a/xmlstarlet.changes b/xmlstarlet.changes
index 1690d25..aeef2c4 100644
--- a/xmlstarlet.changes
+++ b/xmlstarlet.changes
@@ -1,3 +1,18 @@
+-------------------------------------------------------------------
+Fri Jul 22 08:32:57 UTC 2011 - pascal.bleser@opensuse.org
+
+- update to 1.2.1:
+  * check for NULL nodeset result (Bugs #3323189, #3323196)
+  * "-" was being confused with --elif
+  * generated XSLT should also have automatic namespaces
+  * allow -N after other option (Bug #3325166)
+  * namespace values were being registered as prefixes
+  * avoid segfault when asked to move namespace nodes
+  * missing newline in ed --help message
+  * don't use XML_SAVE_WSNONSIG #if libxml < 2.7.8 (Bug #3310475)
+- dropped patch "xmlstarlet-backport_libxml2_2_7_8_XML_SAVE_WSNONSIG.patch",
+  was merged upstream
+
 -------------------------------------------------------------------
 Thu Jun  2 06:40:14 UTC 2011 - pascal.bleser@opensuse.org
 
diff --git a/xmlstarlet.spec b/xmlstarlet.spec
index 9755819..495ddbb 100644
--- a/xmlstarlet.spec
+++ b/xmlstarlet.spec
@@ -24,7 +24,7 @@ BuildRequires:  libxslt-devel >= 1.1.9
 BuildRequires:  sgml-skel
 BuildRequires:  autoconf automake gcc glibc-devel libtool pkgconfig
 Summary:        Command Line Tool to Process XML Documents
-Version:        1.2.0
+Version:        1.2.1
 Release:        1
 License:        MIT License (or similar)
 Group:          Productivity/Publishing/XML
@@ -32,8 +32,6 @@ Group:          Productivity/Publishing/XML
 Source0:        xmlstarlet-%{version}.tar.bz2
 Source1:        %{name}-rpmlintrc
 Patch2:         %{name}-xml_depyx.c.diff
-# pbleser: backport for using libxml2 versions below 2.7.8 that do not support XML_SAVE_WSNONSIG
-Patch3:         xmlstarlet-backport_libxml2_2_7_8_XML_SAVE_WSNONSIG.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 Url:            http://sourceforge.net/projects/xmlstar/
 
@@ -52,7 +50,7 @@ Authors:
 %prep
 %setup -q
 %patch2
-%patch3
+#%patch3
 
 %build
 export CFLAGS="$RPM_OPT_FLAGS -W -Wall"