diff --git a/deskutils/virt-manager/Makefile b/deskutils/virt-manager/Makefile
index 183471017a49..f802a1ce6761 100644
--- a/deskutils/virt-manager/Makefile
+++ b/deskutils/virt-manager/Makefile
@@ -2,8 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	virt-manager
-PORTVERSION=	0.9.4
-PORTREVISION=	2
+PORTVERSION=	0.9.5
 CATEGORIES=	deskutils net-mgmt
 MASTER_SITES=	http://virt-manager.et.redhat.com/download/sources/${PORTNAME}/
 
@@ -15,7 +14,7 @@ LICENSE=	LGPL3
 LIB_DEPENDS=	virt.1000:${PORTSDIR}/devel/libvirt
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}dbus>=0.83.2:${PORTSDIR}/devel/py-dbus \
 		${PYTHON_PKGNAMEPREFIX}libxml2>=2.7.8:${PORTSDIR}/textproc/py-libxml2 \
-		${PYTHON_PKGNAMEPREFIX}virtinst>=0.600.3:${PORTSDIR}/net-mgmt/virtinst \
+		${PYTHON_PKGNAMEPREFIX}virtinst>=0.600.4:${PORTSDIR}/net-mgmt/virtinst \
 		${PYTHON_PKGNAMEPREFIX}vte>=0.26.2:${PORTSDIR}/x11-toolkits/py-vte \
 		gtk-vnc>=0.3.10:${PORTSDIR}/net/gtk-vnc \
 		librsvg2>=2.32.1:${PORTSDIR}/graphics/librsvg2
diff --git a/deskutils/virt-manager/distinfo b/deskutils/virt-manager/distinfo
index 68e5d57bb460..88ec383a56c0 100644
--- a/deskutils/virt-manager/distinfo
+++ b/deskutils/virt-manager/distinfo
@@ -1,2 +1,2 @@
-SHA256 (virt-manager-0.9.4.tar.gz) = dc8c553beeb15bb30cd5517b2105bcc47cf482b03523e522733c52b0e5df0fc0
-SIZE (virt-manager-0.9.4.tar.gz) = 1709809
+SHA256 (virt-manager-0.9.5.tar.gz) = 5d2afb282fb8c4401f9e203dcb41a62746b9a909258d440d508219bc1a33803d
+SIZE (virt-manager-0.9.5.tar.gz) = 1773882
diff --git a/deskutils/virt-manager/pkg-plist b/deskutils/virt-manager/pkg-plist
index 224462dffc63..f1e7bb1474bc 100644
--- a/deskutils/virt-manager/pkg-plist
+++ b/deskutils/virt-manager/pkg-plist
@@ -67,6 +67,7 @@ share/icons/hicolor/48x48/apps/virt-manager.png
 %%DATADIR%%/virtManager/manager.py
 %%DATADIR%%/virtManager/mediadev.py
 %%DATADIR%%/virtManager/migrate.py
+%%DATADIR%%/virtManager/module_trace.py
 %%DATADIR%%/virtManager/netdev.py
 %%DATADIR%%/virtManager/network.py
 %%DATADIR%%/virtManager/nodedev.py
diff --git a/net-mgmt/virtinst/Makefile b/net-mgmt/virtinst/Makefile
index 857d79e8af7e..3448946a0e6e 100644
--- a/net-mgmt/virtinst/Makefile
+++ b/net-mgmt/virtinst/Makefile
@@ -2,8 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	virtinst
-PORTVERSION=	0.600.3
-PORTREVSION=	2
+PORTVERSION=	0.600.4
 CATEGORIES=	net-mgmt
 MASTER_SITES=	http://virt-manager.org/download/sources/${PORTNAME}/
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
@@ -23,4 +22,8 @@ MAN1=		virt-clone.1 virt-convert.1 virt-image.1 virt-install.1
 MAN5=		virt-image.5
 MANCOMPRESSED=	no
 
+post-patch-script:
+	${REINPLACE_CMD} 's|share/man|man|g' \
+		${WRKSRC}/setup.py
+
 .include <bsd.port.mk>
diff --git a/net-mgmt/virtinst/distinfo b/net-mgmt/virtinst/distinfo
index 09059281daee..b33e52d9e881 100644
--- a/net-mgmt/virtinst/distinfo
+++ b/net-mgmt/virtinst/distinfo
@@ -1,2 +1,2 @@
-SHA256 (virtinst-0.600.3.tar.gz) = e41efad3e3c798129af0cec92c1abd6c7e209b5dd4d311acdef0fc1a2daf5006
-SIZE (virtinst-0.600.3.tar.gz) = 8174690
+SHA256 (virtinst-0.600.4.tar.gz) = 6e377a7512eaaecd96f8a91998f2db2feaa6d722c132103f44d1b6447c54b49c
+SIZE (virtinst-0.600.4.tar.gz) = 8180759
diff --git a/net-mgmt/virtinst/files/patch-setup.py b/net-mgmt/virtinst/files/patch-setup.py
deleted file mode 100644
index 81ec49f5dac1..000000000000
--- a/net-mgmt/virtinst/files/patch-setup.py
+++ /dev/null
@@ -1,17 +0,0 @@
---- ./setup.py.orig	2012-02-02 15:02:56.000000000 -0800
-+++ ./setup.py	2012-02-02 15:04:09.000000000 -0800
-@@ -359,12 +359,12 @@
-     packages=['virtinst', 'virtconv', 'virtconv.parsers'],
- 
-     data_files=[
--        ('share/man/man1', [
-+        ('man/man1', [
-             'man/en/virt-install.1',
-             'man/en/virt-clone.1',
-             'man/en/virt-image.1',
-             'man/en/virt-convert.1']),
--        ('share/man/man5', [
-+        ('man/man5', [
-             'man/en/virt-image.5']),
-     ] + _build_lang_data(),
-