--- a/.hgignore	Sat Nov 16 16:06:13 2013 +0000
+++ b/.hgignore	Sat Nov 16 17:27:55 2013 +0000
@@ -23,7 +23,7 @@
 components/python/pycurl/pycurl-7.19.0*
 components/python/python26/Python-2.6.4*
 components/python/setuptools/setuptools-0.6c11*
-components/qemu-kvm/illumos-kvm-cmd-fb98ca5*
+components/qemu-kvm/illumos-kvm-cmd-1c6181b*
 components/sic_team/*/build*
 components/sic_team/java-commons-logging/commons-logging-1.0.4*
 components/sic_team/java-jss/jss-4.3.1.tar.bz2

--- a/components/qemu-kvm/Makefile	Sat Nov 16 16:06:13 2013 +0000
+++ b/components/qemu-kvm/Makefile	Sat Nov 16 17:27:55 2013 +0000
@@ -18,11 +18,11 @@
 
 PATH=	/opt/onbld/bin/i386:/usr/bin:/usr/sbin:/sbin:/usr/gnu/bin
 COMPONENT_NAME=		illumos-kvm-cmd
-COMPONENT_VERSION=	fb98ca5
-IPS_COMPONENT_VERSION=	0.0.1.20130909
+COMPONENT_VERSION=	1c6181b
+IPS_COMPONENT_VERSION=	0.0.1.20131024
 COMPONENT_SRC=		illumos-kvm-cmd-$(COMPONENT_VERSION)
 COMPONENT_ARCHIVE=	$(COMPONENT_SRC).tar.gz
-COMPONENT_ARCHIVE_HASH=	sha256:5e1e909128fa02220a20a62f5895529d2eb10a051715f1261c77d0faa836385c
+COMPONENT_ARCHIVE_HASH=	sha256:1664981d73d4a17e3271f167a15b20601f3c5a9cbb500db9ebe6dfa58d37f87a
 COMPONENT_ARCHIVE_URL=	https://codeload.github.com/joyent/illumos-kvm-cmd/tar.gz/$(COMPONENT_VERSION)
 
 ifeq ($(MACH), sparc)
@@ -59,9 +59,9 @@
 CONFIGURE_OPTIONS += --target-list="i386-softmmu x86_64-softmmu"
 CONFIGURE_OPTIONS += --enable-debug
 
-COMPONENT_BUILD_ENV += PATH=$(PATH):/usr/sbin
+COMPONENT_BUILD_ENV += PATH=$(PATH):/usr/sbin CTFCONVERT=/opt/onbld/bin/i386/ctfconvert CTFMERGE=/opt/onbld/bin/i386/ctfmerge
 
-COMPONENT_INSTALL_ENV += PATH=$(PATH):/usr/sbin
+COMPONENT_INSTALL_ENV += PATH=$(PATH):/usr/sbin CTFCONVERT=/opt/onbld/bin/i386/ctfconvert CTFMERGE=/opt/onbld/bin/i386/ctfmerge
 
 build_sparc:
 	@echo "Not available."

--- a/components/qemu-kvm/patches/ctf.patch	Sat Nov 16 16:06:13 2013 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,11 +0,0 @@
---- joyent-illumos-kvm-cmd-4f48eea/ctf.sh.orig	2012-03-20 20:35:03.279369956 +0000
-+++ joyent-illumos-kvm-cmd-4f48eea/ctf.sh	2012-03-20 20:35:20.556268323 +0000
-@@ -10,7 +10,7 @@
- #
- 
- sh_arg0=$(basename $0)
--ctf_bin=$(pwd)/../../../illumos/usr/src/tools/proto/root_i386-nd/opt/onbld/bin/i386/ctfconvert
-+ctf_bin=/opt/onbld/bin/i386/ctfconvert
- 
- function fail
- {