diff --git a/comms/deforaos-phone/Makefile b/comms/deforaos-phone/Makefile
index 5332237369b1..650486992923 100644
--- a/comms/deforaos-phone/Makefile
+++ b/comms/deforaos-phone/Makefile
@@ -2,10 +2,9 @@
 # $FreeBSD$
 
 PORTNAME=	phone
-PORTVERSION=	0.3.11
-PORTREVISION=	1
+PORTVERSION=	0.3.12
 CATEGORIES=	comms
-MASTER_SITES=	http://www.defora.org/os/download/download/3721/
+MASTER_SITES=	http://www.defora.org/os/download/download/4296/
 PKGNAMEPREFIX=	deforaos-
 DISTNAME=	Phone-${PORTVERSION}
 
@@ -14,20 +13,22 @@ COMMENT=	DeforaOS telephony application
 
 LICENSE=	GPLv3
 
-LIB_DEPENDS=	System:${PORTSDIR}/devel/deforaos-libsystem \
-		Desktop:${PORTSDIR}/x11/deforaos-libdesktop \
-		pulse:${PORTSDIR}/audio/pulseaudio \
-		purple:${PORTSDIR}/net-im/libpurple \
-		sofia-sip-ua:${PORTSDIR}/net/sofia-sip
+LIB_DEPENDS=	libSystem.so:${PORTSDIR}/devel/deforaos-libsystem \
+		libDesktop.so:${PORTSDIR}/x11/deforaos-libdesktop \
+		libpulse.so:${PORTSDIR}/audio/pulseaudio \
+		libpurple.so:${PORTSDIR}/net-im/libpurple \
+		libsofia-sip-ua.so:${PORTSDIR}/net/sofia-sip
 BUILD_DEPENDS=	locker:${PORTSDIR}/x11/deforaos-locker \
-		${LOCALBASE}/include/linux/videodev2.h:${PORTSDIR}/multimedia/v4l_compat
+		${LOCALBASE}/include/linux/videodev2.h:${PORTSDIR}/multimedia/v4l_compat \
+		xsltproc:${PORTSDIR}/textproc/libxslt \
+		${LOCALBASE}/share/xsl/docbook/manpages/docbook.xsl:${PORTSDIR}/textproc/docbook-xsl
 
-USES=		pkgconfig gettext
-USE_GNOME=	gtk20 desktopfileutils
+USES=		desktop-file-utils gettext pkgconfig
+USE_GNOME=	gtk20
 INSTALLS_ICONS=	yes
 MAKE_ARGS+=	PREFIX=${PREFIX}
+MAKE_ENV+=	MANDIR=${STAGEDIR}${MANPREFIX}/man
 
-NO_STAGE=	yes
 post-patch:
 	@${REINPLACE_CMD} -e 's,/dev/modem,/dev/cuaU0,g' \
 		${WRKSRC}/src/modems/hayes.c
diff --git a/comms/deforaos-phone/distinfo b/comms/deforaos-phone/distinfo
index b22fa91f2302..89a3fb7145d1 100644
--- a/comms/deforaos-phone/distinfo
+++ b/comms/deforaos-phone/distinfo
@@ -1,2 +1,2 @@
-SHA256 (Phone-0.3.11.tar.gz) = 6d0de8cc17f5ea34062e35dac8179bdcd8bd96e9498bfe3bb68c3dcb7fe4e0fc
-SIZE (Phone-0.3.11.tar.gz) = 166060
+SHA256 (Phone-0.3.12.tar.gz) = 53c6d2484a3c11d6bdcd980254cfa41c5f5c8fbc811892e61bf0425a3bde416d
+SIZE (Phone-0.3.12.tar.gz) = 175768
diff --git a/comms/deforaos-phone/files/patch-doc__Makefile b/comms/deforaos-phone/files/patch-doc__Makefile
new file mode 100644
index 000000000000..f1feeda08d81
--- /dev/null
+++ b/comms/deforaos-phone/files/patch-doc__Makefile
@@ -0,0 +1,23 @@
+--- doc/Makefile.orig	2013-11-04 12:16:46.534030500 +0100
++++ doc/Makefile	2013-11-04 12:17:20.050448106 +0100
+@@ -1,4 +1,4 @@
+-TARGETS	= index.html phone.1 phone.html phonectl.1 phonectl.html
++TARGETS	= phone.1 phonectl.1
+ PREFIX	= /usr/local
+ DESTDIR	=
+ RM	= rm -f
+@@ -33,14 +33,10 @@
+ 
+ install: $(TARGETS)
+ 	./docbook.sh -P "$(DESTDIR)$(PREFIX)" -i -- "phone.1"
+-	./docbook.sh -P "$(DESTDIR)$(PREFIX)" -i -- "phone.html"
+ 	./docbook.sh -P "$(DESTDIR)$(PREFIX)" -i -- "phonectl.1"
+-	./docbook.sh -P "$(DESTDIR)$(PREFIX)" -i -- "phonectl.html"
+ 
+ uninstall:
+ 	./docbook.sh -P "$(DESTDIR)$(PREFIX)" -u -- "phone.1"
+-	./docbook.sh -P "$(DESTDIR)$(PREFIX)" -u -- "phone.html"
+ 	./docbook.sh -P "$(DESTDIR)$(PREFIX)" -u -- "phonectl.1"
+-	./docbook.sh -P "$(DESTDIR)$(PREFIX)" -u -- "phonectl.html"
+ 
+ .PHONY: all clean distclean install uninstall
diff --git a/comms/deforaos-phone/pkg-plist b/comms/deforaos-phone/pkg-plist
index 7b2c09df8957..cbce0b80a050 100644
--- a/comms/deforaos-phone/pkg-plist
+++ b/comms/deforaos-phone/pkg-plist
@@ -20,10 +20,14 @@ lib/Phone/plugins/notify.so
 lib/Phone/plugins/openmoko.so
 lib/Phone/plugins/oss.so
 lib/Phone/plugins/panel.so
+lib/Phone/plugins/password.so
 lib/Phone/plugins/profiles.so
+lib/Phone/plugins/pulseaudio.so
 lib/Phone/plugins/smscrypt.so
 lib/Phone/plugins/systray.so
 lib/Phone/plugins/ussd.so
+man/man1/phone.1.gz
+man/man1/phonectl.1.gz
 share/applications/phone-contacts.desktop
 share/applications/phone-dialer.desktop
 share/applications/phone-log.desktop
@@ -65,3 +69,16 @@ share/locale/fr/LC_MESSAGES/Phone.mo
 @dirrm lib/Phone/modem
 @dirrm lib/Phone/plugins
 @dirrm lib/Phone
+@dirrmtry share/icons/hicolor/48x48/apps
+@dirrmtry share/icons/hicolor/48x48
+@dirrmtry share/icons/hicolor/32x32/apps
+@dirrmtry share/icons/hicolor/32x32
+@dirrmtry share/icons/hicolor/24x24/apps
+@dirrmtry share/icons/hicolor/24x24
+@dirrmtry share/icons/hicolor/22x22/apps
+@dirrmtry share/icons/hicolor/22x22
+@dirrmtry share/icons/hicolor/16x16/apps
+@dirrmtry share/icons/hicolor/16x16
+@dirrmtry share/icons/hicolor
+@dirrmtry share/icons
+@dirrmtry include/Desktop