diff --git a/baselibs.conf b/baselibs.conf
index 1d22017..a0bae3e 100644
--- a/baselibs.conf
+++ b/baselibs.conf
@@ -1 +1 @@
-libHX22
+libHX25
diff --git a/libHX-3.4.tar.xz b/libHX-3.4.tar.xz
deleted file mode 100644
index 18d6791..0000000
--- a/libHX-3.4.tar.xz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:75dd2d3f6d995761e34303c7ae70500412389ec80f4fcac5c41ab4d008bfea6f
-size 765964
diff --git a/libHX-3.6.tar.xz b/libHX-3.6.tar.xz
new file mode 100644
index 0000000..90fcb24
--- /dev/null
+++ b/libHX-3.6.tar.xz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:be2ba98cc8facecc42dbea2fa057745c8a48dd495d5743496efff9646c531410
+size 768212
diff --git a/libHX-3.6.tar.xz.asc b/libHX-3.6.tar.xz.asc
new file mode 100644
index 0000000..00937b2
--- /dev/null
+++ b/libHX-3.6.tar.xz.asc
@@ -0,0 +1,7 @@
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.12 (GNU/Linux)
+
+iEYEABECAAYFAkxpd00ACgkQ92gFgoRMQ2CR0ACfc4JqAstJrsr0IsAz5bj/H4aL
+iW4AmwSc08Y4fxQYASSeAIag7sVJxJ6+
+=LCaZ
+-----END PGP SIGNATURE-----
diff --git a/libHX.changes b/libHX.changes
index b1f591e..90a8b8e 100644
--- a/libHX.changes
+++ b/libHX.changes
@@ -1,3 +1,21 @@
+-------------------------------------------------------------------
+Wed Aug 25 21:44:17 UTC 2010 - jengelh@medozas.de
+
+- update to new upstream version 3.6
+* Fixes in 3.6:
+* bitmap: set/clear/test had no effect due to wrong type selection
+* bitmap: avoid left-shift larger than type on 64-bit
+* string: fixed buffer overflow in HX_split when too few fields were present
+  in the input (CVE-2010-2947)
+* Fixes in 3.5:
+* format2: failure to skip escaped char in "%(echo foo\ bar)" was corrected
+* proc: properly check for HXPROC_STDx--HXPROC_STDx_NULL overlap
+* strquote: do not cause allocation with invalid format numbers
+* Enhancements:
+* new format2 expandable functions like %(exec) and %(shell)
+* LDAP search filter and RDN quoting support
+* Old formatter was removed
+
 -------------------------------------------------------------------
 Wed Apr  7 02:40:35 UTC 2010 - jengelh@medozas.de
 
diff --git a/libHX.spec b/libHX.spec
index 4999bec..2720b77 100644
--- a/libHX.spec
+++ b/libHX.spec
@@ -1,5 +1,5 @@
 #
-# spec file for package libHX (Version 3.4)
+# spec file for package libHX (Version 3.6)
 #
 # Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany.
 #
@@ -19,15 +19,16 @@
 
 
 Name:           libHX
-%define lname   libHX22
+%define lname   libHX25
 BuildRequires:  gcc-c++ xz
-Summary:        Useful collection of routines for programming
-Version:        3.4
+Summary:        Useful collection of routines for C and C++ programming
+Version:        3.6
 Release:        1
 License:        LGPL v2+
 Prefix:         /usr
 Group:          System/Libraries
 Source:         http://downloads.sf.net/libhx/libHX-%version.tar.xz
+Source3:        http://downloads.sf.net/libhx/libHX-%version.tar.xz.asc
 Source2:        baselibs.conf
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 %define debug_package_requires %lname = %{version}-%{release}
@@ -49,7 +50,8 @@ Authors:
 --------
     Jan Engelhardt <jengelh [at] medozas de>
 
-%package -n libHX22
+%package -n %lname
+
 License:        LGPL v2+
 Summary:        Useful collection of routines for C and C++ programming
 Group:          System/Libraries
@@ -115,9 +117,6 @@ rm -f ${RPM_BUILD_ROOT}/%{_libdir}/%{name}.la
 %check
 make check
 
-%clean
-rm -rf $RPM_BUILD_ROOT
-
 %post -n %{lname} -p /sbin/ldconfig
 
 %postun -n %{lname} -p /sbin/ldconfig