Index: head/sysutils/k3b/Makefile
===================================================================
--- head/sysutils/k3b/Makefile	(revision 498951)
+++ head/sysutils/k3b/Makefile	(revision 498952)
@@ -1,52 +1,56 @@
 # $FreeBSD$
 
 PORTNAME=	k3b
 DISTVERSION=	${KDE_APPLICATIONS_VERSION}
+PORTREVISION=	1
 CATEGORIES=	sysutils multimedia kde-applications
 
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	KDE CD/DVD writing suite
 
 LIB_DEPENDS=	libFLAC.so:audio/flac \
 		libKF5Cddb.so:audio/libkcddb \
 		libcdda_paranoia.so:audio/cdparanoia \
 		libdvdread.so:multimedia/libdvdread \
 		libmad.so:audio/libmad \
 		libmp3lame.so:audio/lame \
 		libogg.so:audio/libogg \
 		libsamplerate.so:audio/libsamplerate \
 		libsndfile.so:audio/libsndfile \
 		libtag.so:audio/taglib \
 		libvorbis.so:audio/libvorbis
 RUN_DEPENDS=	cdrecord:sysutils/cdrtools
 BUILD_DEPENDS=	cdrecord:sysutils/cdrtools
 
 USES=		cmake compiler:c++11-lang desktop-file-utils gettext iconv \
 		kde:5 pkgconfig qt:5 shared-mime-info tar:xz
 
 USE_KDE=	archive attica auth bookmarks codecs completion config \
 		configwidgets coreaddons ecm filemetadata i18n iconthemes \
 		itemviews jobwidgets kcmutils kio newstuff notifications \
 		notifyconfig service solid widgetsaddons xmlgui
 USE_QT=		core dbus gui network webkit widgets xml \
 		buildtools_build qmake_build
 
 # The ffmpeg-plugin needs patching
 CMAKE_ARGS=	-DK3B_BUILD_FFMPEG_DECODER_PLUGIN:BOOL=FALSE
 
-OPTIONS_DEFINE=		CDRDAO DVDPLUSRW EMOVIX VCDIMAGER DOCS
+OPTIONS_DEFINE=		CDRDAO CDRSKIN DVDPLUSRW EMOVIX VCDIMAGER DOCS
 OPTIONS_DEFAULT=	${OPTIONS_DEFINE}
 
 CDRDAO_DESC=		Burning: cdrdao
 CDRDAO_RUN_DEPENDS=	cdrdao:sysutils/cdrdao
 
 DVDPLUSRW_DESC=		Burning: DVD+RW tools (DVD+/-R(W))
 DVDPLUSRW_RUN_DEPENDS=	dvd+rw-format:sysutils/dvd+rw-tools
 
 EMOVIX_DESC=		Burning: eMovix (bootable video CDs)
 EMOVIX_RUN_DEPENDS=	mkmovixiso:multimedia/emovix
 
 VCDIMAGER_DESC=		Burning: VCDImager (video CDs)
 VCDIMAGER_RUN_DEPENDS=	vcdxrip:multimedia/vcdimager
+
+CDRSKIN_DESC=		Burning: cdrskin (improved performance)
+CDRSKIN_RUN_DEPENDS=	cdrskin:devel/libburn
 
 .include <bsd.port.mk>
Index: head/sysutils/k3b/pkg-message
===================================================================
--- head/sysutils/k3b/pkg-message	(revision 498951)
+++ head/sysutils/k3b/pkg-message	(revision 498952)
@@ -1,36 +1,42 @@
 1. The FreeBSD k3b port supports SCSI drives only. If you have IDE CD or DVD
    drives, use them through the cam system. See Chapter 17.5.1 of the handbook
    (http://www.freebsd.org/doc/en_US.ISO8859-1/books/handbook/creating-cds.html)
 2. k3b has to be started from a root console, which is not recommended.
    Alternatively, do ALL of the following:
    a. Set the suid flag on cdrecord and cdrdao. The 'Notes' chapter of
       'man cdrecord' discusses this.
    b. Set the vfs.usermount sysctl variable to 1.
         # sysctl vfs.usermount=1
-      Add the line vfs.usermount=1 to /etc/sysctl.conf
+      Add this line to /etc/sysctl.conf to make it permanent:
+        vfs.usermount=1
       Note that this has negative security implications
    c. Every user must have read and write access to /dev/cdX:
       - add to your /etc/devfs.rules under '[system=10]':
           add path 'cd*' mode 666
       - or if you prefer allow access for a group XXX only add instead:
           add path 'cd*' mode 660 group XXX
-      - to enable it, add to your /etc/rc.conf a
-          devfs_system_ruleset="system"
+      - to enable it, add to your /etc/rc.conf
+          # sysrc devfs_system_ruleset="system"
    d. Every user who should be able to use k3b must have read and write access
       to all pass through devices connected with CD and DVD drives and to the
       /dev/xpt0 device. Run 'camcontrol devlist' to identify those devices (seek
       string 'passX' at the end of each line). Note, that this is a security
       leak as well but that there is no alternative!
       - add to your /etc/devfs.rules under '[system=10]':
           add path 'pass*' mode 666
           add path 'xpt0' mode 666
       - or if you prefer allow access for a group XXX only add instead:
           add path 'pass*' mode 660 group XXX
           add path 'xpt0' mode 660 group XXX
       - to enable it, add to your /etc/rc.conf
-          devfs_system_ruleset="system"
+          # sysrc devfs_system_ruleset="system"
       - to apply these changes without reboot, run as root:
-          /etc/rc.d/devfs restart
+          # service devfs restart
 3. Create a directory on a partition, which has enough disk space to hold a CDs
    or DVDs content (usually below /usr). Enter this directory in Settings->
    Configure K3b...->Misc.
+4. You must configure devel/kf5-solid appropriately:
+   a. Either use the (default) HAL backend, and enable HAL in /etc/rc.conf via
+      # sysrc hald_enable="YES"
+   b. *or* use the (experimental) BSDISKS backend.
+