diff --git a/hxtools-20140325.tar.asc b/hxtools-20140325.tar.asc
deleted file mode 100644
index 0968c42..0000000
--- a/hxtools-20140325.tar.asc
+++ /dev/null
@@ -1,7 +0,0 @@
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.22 (GNU/Linux)
-
-iF4EABEIAAYFAlMxzZkACgkQkb3j62iiDkU0ewEAhUK6DZN5jtuzFQvPjqLe8wVc
-enAeBsbQ+MkhyfyGNd4A/0eL2pPa9u6xvxOIfgZH+lCpnSJUgdNbp50gI/1dONMx
-=MWB0
------END PGP SIGNATURE-----
diff --git a/hxtools-20140325.tar.xz b/hxtools-20140325.tar.xz
deleted file mode 100644
index 4ebc7c7..0000000
--- a/hxtools-20140325.tar.xz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:a66a197a437c23e78cddffcfaf07e6bada56736b6ba1766c3b4333e29ba2a589
-size 295220
diff --git a/hxtools-20140703.tar.asc b/hxtools-20140703.tar.asc
new file mode 100644
index 0000000..368727b
--- /dev/null
+++ b/hxtools-20140703.tar.asc
@@ -0,0 +1,17 @@
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.22 (GNU/Linux)
+
+iQIcBAABAgAGBQJTtUsJAAoJEN//LNsZ/DON1+cP+wRLkQ5doBLzO4xt7MK0MigH
+nhl3FAO4aJ8NEgTNXn/8ZoQNu48PIht5Gvdv7gYLTZiu+25opsiDNSi9ahIFcghR
+jK+BvQiyGbP1JpmcBcyurWAGEMfUdGmRIQTaZyrqt6tUFw5uwQ4BUJxCzFR9XB2m
+acSE2vK/0H3NobjzXUVkoaUZjgxF24F0WyYlFk9l/AjsHm66NjvZukW1qYVVP7/5
+SKPLT53WlNkEW3Y3NRan6usoiTSDxYc1ZQp+ARpBKiJKcL23O0jRqEeQO913JvIS
+GDybDailvt5/6YINGP3YHP2YCmw5BoTkWK3ot/UMU7YnsxurEw/gQNdewDsujLNF
+H4YM997IjpbHwYoNXJtKQ3AYF4WhXXFLzTxX+K9elS+bQs56R027OecZoJPU4/Sr
+gZCdvSMqzE31p9S/PA8NkDnYlVQYRLIJLUkCaOZG+gINkLMJ6sKFYW7Kj5yFIJK6
+2puN+TyeVREUOoVvQpjU9EziXaPG+71aXq3o5neDIBBMy7ii4K1gNzWH4UuGZpGh
+6QH3+DLw4N8fuxv5s1ewFuyWH9P3IcyBbPOJhscZ8H5geA7/q/t/3RnGJF8dQgjb
+kVpzJaaP6ua/MH1OaWR+zp/UU+5OZf5KOnUL06K4Sm0kJar8qpGKJZvp0ivXkVWO
+KtLZMT0cHyapHrZibsIG
+=6Ast
+-----END PGP SIGNATURE-----
diff --git a/hxtools-20140703.tar.lz b/hxtools-20140703.tar.lz
new file mode 100644
index 0000000..d7db3c2
--- /dev/null
+++ b/hxtools-20140703.tar.lz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:9e83de1d59379c9b5bfd7d7b9b7bd53c65a7124632bd667879b9ea0b2d0502c1
+size 292757
diff --git a/hxtools.changes b/hxtools.changes
index 13e64d5..a917fa3 100644
--- a/hxtools.changes
+++ b/hxtools.changes
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Thu Jul  3 12:27:07 UTC 2014 - jengelh@inai.de
+
+- Update to new upstream release 20140703
+* New utilities: clt2pbm, clt2bdf/clt2sfd, cltscale
+- Remove remove-conflicting-types.diff (merged upstream)
+
 -------------------------------------------------------------------
 Thu Apr  3 11:21:18 UTC 2014 - dmueller@suse.com
 
diff --git a/hxtools.spec b/hxtools.spec
index 582a32d..d7247dd 100644
--- a/hxtools.spec
+++ b/hxtools.spec
@@ -17,24 +17,23 @@
 
 
 Name:           hxtools
-Version:        20140325
+Version:        20140703
 Release:        0
 Summary:        Collection of day-to-day tools (binaries)
 License:        GPL-2.0+ and WTFPL
 Group:          Productivity/Other
 Url:            http://inai.de/projects/hxtools/
 
-Source:         http://jftp.inai.de/hxtools/%name-%version.tar.xz
+Source:         http://jftp.inai.de/hxtools/%name-%version.tar.lz
 Source2:        http://jftp.inai.de/hxtools/%name-%version.tar.asc
 Source3:        %name.keyring
-Patch0:         remove-conflicting-types.diff
 # This package has a "Upstream First" policy for patches.
 # See https://en.opensuse.org/openSUSE:Packaging_Patches_guidelines
+BuildRequires:  bdftopcf
 BuildRequires:  fdupes
 BuildRequires:  libcap-devel >= 2
-BuildRequires:  bdftopcf
+BuildRequires:  lzip
 BuildRequires:  pkgconfig >= 0.21
-BuildRequires:  xz
 BuildRequires:  pkgconfig(libHX) >= 3.17
 BuildRequires:  pkgconfig(libpci) >= 3
 BuildRequires:  pkgconfig(mount) >= 2.20
@@ -163,7 +162,6 @@ an entire mount.
 
 %prep
 %setup -q
-%patch0
 
 %build
 %configure
@@ -196,6 +194,7 @@ rm -Rf "$b/%_sysconfdir/profile.d" "$b/%_sysconfdir"/hx*;
 %defattr(-,root,root)
 %doc LICENSE*
 %_bindir/bin2c
+%_bindir/clt2bdf
 %_bindir/declone
 %_bindir/hcdplay
 %_bindir/omixer
@@ -204,9 +203,9 @@ rm -Rf "$b/%_sysconfdir/profile.d" "$b/%_sysconfdir"/hx*;
 %_bindir/tailhex
 %_bindir/xcp
 %dir %hldir
-%hldir/437cipher
 %hldir/bsvplay
 %hldir/cctypeinfo
+%hldir/clt2pbm
 %hldir/pcmdiff
 %hldir/peicon
 %hldir/printcaps
@@ -238,10 +237,12 @@ rm -Rf "$b/%_sysconfdir/profile.d" "$b/%_sysconfdir"/hx*;
 %hldir/diff2php
 %hldir/doxygen-kerneldoc-filter
 %hldir/extract_*
-%hldir/*2*
+%hldir/fnt2bdf
 %hldir/git-*
 %hldir/logontime
 %hldir/mailsplit
+%hldir/mod2ogg
+%hldir/mpg2ogg
 %hldir/recursive_lower
 %hldir/shared.pm
 %hldir/sourcefuncsize
diff --git a/remove-conflicting-types.diff b/remove-conflicting-types.diff
deleted file mode 100644
index b2e481c..0000000
--- a/remove-conflicting-types.diff
+++ /dev/null
@@ -1,16 +0,0 @@
---- sadmin/xfs_irecover.c
-+++ sadmin/xfs_irecover.c
-@@ -42,12 +42,7 @@
- #include <libHX/proc.h>
- #include <libHX/string.h>
- #include <arpa/inet.h>
--
--typedef int8_t __s8;
--typedef uint8_t __u8;
--typedef uint16_t __be16;
--typedef uint32_t __be32;
--typedef uint64_t __be64;
-+#include <linux/types.h>
- 
- struct work_info {
- 	char *device;