diff --git a/corosync.spec.in b/corosync.spec.in
index 447fccd0..1b3246f5 100644
--- a/corosync.spec.in
+++ b/corosync.spec.in
@@ -1,493 +1,500 @@
 @ALPHATAG@
 @NUMCOMM@
 @DIRTY@
 
 # Conditionals
 # Invoke "rpmbuild --without <feature>" or "rpmbuild --with <feature>"
 # to disable or enable specific features
 %bcond_with testagents
 %bcond_with watchdog
 %bcond_with monitoring
 %bcond_with snmp
 %bcond_with dbus
 %bcond_with rdma
 %bcond_with systemd
 %bcond_with upstart
 %bcond_with xmlconf
 %bcond_with runautogen
 %bcond_with qdevices
 %bcond_with qnetd
 
 %global gitver %{?numcomm:.%{numcomm}}%{?alphatag:.%{alphatag}}%{?dirty:.%{dirty}}
 %global gittarver %{?numcomm:.%{numcomm}}%{?alphatag:-%{alphatag}}%{?dirty:-%{dirty}}
 
 Name: corosync
 Summary: The Corosync Cluster Engine and Application Programming Interfaces
 Version: @version@
 Release: 1%{?gitver}%{?dist}
 License: BSD
 Group: System Environment/Base
 URL: http://corosync.github.io/corosync/
 Source0: http://build.clusterlabs.org/corosync/releases/%{name}-%{version}%{?gittarver}.tar.gz
 
 # Runtime bits
 Requires: corosynclib = %{version}-%{release}
 Requires(pre): /usr/sbin/useradd
 Requires(post): /sbin/chkconfig
 Requires(preun): /sbin/chkconfig
 Conflicts: openais <= 0.89, openais-devel <= 0.89
 
 # Build bits
 
 BuildRequires: groff
 BuildRequires: libqb-devel
 BuildRequires: nss-devel
 BuildRequires: zlib-devel
 %if %{with runautogen}
 BuildRequires: autoconf automake libtool
 %endif
 %if %{with monitoring}
 BuildRequires: libstatgrab-devel
 %endif
 %if %{with rdma}
 BuildRequires: libibverbs-devel librdmacm-devel
 %endif
 %if %{with snmp}
 BuildRequires: net-snmp-devel
 %endif
 %if %{with dbus}
 BuildRequires: dbus-devel
 %endif
 %if %{with systemd}
 BuildRequires: systemd-units
 Requires(post): systemd
 Requires(preun): systemd
 Requires(postun): systemd
 %endif
 %if %{with xmlconf}
 Requires: libxslt
 %endif
 %if %{with qdevices} || %{with qnetd}
 Requires: nss-tools
 %endif
 %if %{with qnetd}
 BuildRequires: sed
 %endif
 
 BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 
 %prep
 %setup -q -n %{name}-%{version}%{?gittarver}
 
 %build
 %if %{with runautogen}
 ./autogen.sh
 %endif
 
 %if %{with rdma}
 export ibverbs_CFLAGS=-I/usr/include/infiniband \
 export ibverbs_LIBS=-libverbs \
 export rdmacm_CFLAGS=-I/usr/include/rdma \
 export rdmacm_LIBS=-lrdmacm \
 %endif
 %{configure} \
 %if %{with testagents}
 	--enable-testagents \
 %endif
 %if %{with watchdog}
 	--enable-watchdog \
 %endif
 %if %{with monitoring}
 	--enable-monitoring \
 %endif
 %if %{with snmp}
 	--enable-snmp \
 %endif
 %if %{with dbus}
 	--enable-dbus \
 %endif
 %if %{with rdma}
 	--enable-rdma \
 %endif
 %if %{with systemd}
 	--enable-systemd \
 %endif
 %if %{with upstart}
 	--enable-upstart \
 %endif
 %if %{with xmlconf}
 	--enable-xmlconf \
 %endif
 %if %{with qdevices}
 	--enable-qdevices \
 %endif
 %if %{with qnetd}
 	--enable-qnetd \
 %endif
 	--with-initddir=%{_initrddir} \
 	--with-systemddir=%{_unitdir} \
 	--with-upstartdir=%{_sysconfdir}/init
 
 make %{_smp_mflags}
 
 %install
 rm -rf %{buildroot}
 
 make install DESTDIR=%{buildroot}
 
 %if %{with dbus}
 mkdir -p -m 0700 %{buildroot}/%{_sysconfdir}/dbus-1/system.d
 install -m 644 %{_builddir}/%{name}-%{version}%{?gittarver}/conf/corosync-signals.conf %{buildroot}/%{_sysconfdir}/dbus-1/system.d/corosync-signals.conf
 %endif
 
 ## tree fixup
 # drop static libs
 rm -f %{buildroot}%{_libdir}/*.a
 rm -f %{buildroot}%{_libdir}/*.la
 # drop docs and html docs for now
 rm -rf %{buildroot}%{_docdir}/*
 # /etc/sysconfig/corosync-notifyd
 mkdir -p %{buildroot}%{_sysconfdir}/sysconfig
 install -m 644 tools/corosync-notifyd.sysconfig.example \
    %{buildroot}%{_sysconfdir}/sysconfig/corosync-notifyd
 # /etc/sysconfig/corosync
 install -m 644 init/corosync.sysconfig.example \
    %{buildroot}%{_sysconfdir}/sysconfig/corosync
 
+%if %{with qdevices}
+# /etc/sysconfig/corosync-qdevice
+install -m 644 init/corosync-qdevice.sysconfig.example \
+   %{buildroot}%{_sysconfdir}/sysconfig/corosync-qdevice
+%endif
+
 %if %{with qnetd}
 # /etc/sysconfig/corosync-qnetd
 install -m 644 init/corosync-qnetd.sysconfig.example \
    %{buildroot}%{_sysconfdir}/sysconfig/corosync-qnetd
 %if %{with systemd}
 sed -i -e 's/^#User=/User=/' \
    %{buildroot}%{_unitdir}/corosync-qnetd.service
 %else
 sed -i -e 's/^COROSYNC_QNETD_RUNAS=""$/COROSYNC_QNETD_RUNAS="coroqnetd"/' \
    %{buildroot}%{_sysconfdir}/sysconfig/corosync-qnetd
 %endif
 %endif
 
 %clean
 rm -rf %{buildroot}
 
 %description
 This package contains the Corosync Cluster Engine Executive, several default
 APIs and libraries, default configuration files, and an init script.
 
 %post
 %if %{with systemd} && 0%{?systemd_post:1}
 %systemd_post corosync.service
 %else
 if [ $1 -eq 1 ]; then
 	/sbin/chkconfig --add corosync || :
 fi
 %endif
 
 %preun
 %if %{with systemd} && 0%{?systemd_preun:1}
 %systemd_preun corosync.service
 %else
 if [ $1 -eq 0 ]; then
 	/sbin/service corosync stop &>/dev/null || :
 	/sbin/chkconfig --del corosync || :
 fi
 %endif
 
 %postun
 %if %{with systemd} && 0%{?systemd_postun:1}
 %systemd_postun
 %endif
 
 %files
 %defattr(-,root,root,-)
 %doc LICENSE SECURITY
 %{_sbindir}/corosync
 %{_sbindir}/corosync-keygen
 %{_sbindir}/corosync-cmapctl
 %{_sbindir}/corosync-cfgtool
 %{_sbindir}/corosync-cpgtool
 %{_sbindir}/corosync-quorumtool
 %{_sbindir}/corosync-notifyd
 %{_bindir}/corosync-blackbox
 %if %{with xmlconf}
 %{_bindir}/corosync-xmlproc
 %config(noreplace) %{_sysconfdir}/corosync/corosync.xml.example
 %dir %{_datadir}/corosync
 %{_datadir}/corosync/xml2conf.xsl
 %{_mandir}/man8/corosync-xmlproc.8*
 %{_mandir}/man5/corosync.xml.5*
 %endif
 %dir %{_sysconfdir}/corosync
 %dir %{_sysconfdir}/corosync/uidgid.d
 %config(noreplace) %{_sysconfdir}/corosync/corosync.conf.example
 %config(noreplace) %{_sysconfdir}/corosync/corosync.conf.example.udpu
 %config(noreplace) %{_sysconfdir}/sysconfig/corosync-notifyd
 %config(noreplace) %{_sysconfdir}/sysconfig/corosync
 %config(noreplace) %{_sysconfdir}/logrotate.d/corosync
 %if %{with dbus}
 %{_sysconfdir}/dbus-1/system.d/corosync-signals.conf
 %endif
 %if %{with snmp}
 %{_datadir}/snmp/mibs/COROSYNC-MIB.txt
 %endif
 %if %{with systemd}
 %{_unitdir}/corosync.service
 %{_unitdir}/corosync-notifyd.service
 %dir %{_datadir}/corosync
 %{_datadir}/corosync/corosync
 %{_datadir}/corosync/corosync-notifyd
 %else
 %{_initrddir}/corosync
 %{_initrddir}/corosync-notifyd
 %endif
 %if %{with upstart}
 %{_sysconfdir}/init/corosync.conf
 %{_sysconfdir}/init/corosync-notifyd.conf
 %endif
 %dir %{_localstatedir}/lib/corosync
 %dir %{_localstatedir}/log/cluster
 %{_mandir}/man8/corosync_overview.8*
 %{_mandir}/man8/corosync.8*
 %{_mandir}/man8/corosync-blackbox.8*
 %{_mandir}/man8/corosync-cmapctl.8*
 %{_mandir}/man8/corosync-keygen.8*
 %{_mandir}/man8/corosync-cfgtool.8*
 %{_mandir}/man8/corosync-cpgtool.8*
 %{_mandir}/man8/corosync-notifyd.8*
 %{_mandir}/man8/corosync-quorumtool.8*
 %{_mandir}/man5/corosync.conf.5*
 %{_mandir}/man5/votequorum.5*
 %{_mandir}/man8/cmap_keys.8*
 
 # optional testagent rpm
 #
 %if %{with testagents}
 
 %package -n corosync-testagents
 Summary: The Corosync Cluster Engine Test Agents
 Group: Development/Libraries
 Requires: %{name} = %{version}-%{release}
 
 %description -n corosync-testagents
 This package contains corosync test agents.
 
 %files -n corosync-testagents
 %defattr(755,root,root,-)
 %{_datadir}/corosync/tests/mem_leak_test.sh
 %{_datadir}/corosync/tests/net_breaker.sh
 %{_datadir}/corosync/tests/cmap-dispatch-deadlock.sh
 %{_datadir}/corosync/tests/shm_leak_audit.sh
 %{_bindir}/cpg_test_agent
 %{_bindir}/sam_test_agent
 %{_bindir}/votequorum_test_agent
 
 %endif
 
 # library
 #
 %package -n corosynclib
 Summary: The Corosync Cluster Engine Libraries
 Group: System Environment/Libraries
 Requires: %{name} = %{version}-%{release}
 
 %description -n corosynclib
 This package contains corosync libraries.
 
 %files -n corosynclib
 %defattr(-,root,root,-)
 %doc LICENSE
 %{_libdir}/libcfg.so.*
 %{_libdir}/libcpg.so.*
 %{_libdir}/libcmap.so.*
 %{_libdir}/libtotem_pg.so.*
 %{_libdir}/libquorum.so.*
 %{_libdir}/libvotequorum.so.*
 %{_libdir}/libsam.so.*
 %{_libdir}/libcorosync_common.so.*
 
 %post -n corosynclib -p /sbin/ldconfig
 
 %postun -n corosynclib -p /sbin/ldconfig
 
 %package -n corosynclib-devel
 Summary: The Corosync Cluster Engine Development Kit
 Group: Development/Libraries
 Requires: corosynclib = %{version}-%{release}
 Requires: pkgconfig
 Provides: corosync-devel = %{version}
 Obsoletes: corosync-devel < 0.92-7
 
 %description -n corosynclib-devel
 This package contains include files and man pages used to develop using
 The Corosync Cluster Engine APIs.
 
 %files -n corosynclib-devel
 %defattr(-,root,root,-)
 %doc LICENSE
 %dir %{_includedir}/corosync/
 %{_includedir}/corosync/corodefs.h
 %{_includedir}/corosync/cfg.h
 %{_includedir}/corosync/cmap.h
 %{_includedir}/corosync/corotypes.h
 %{_includedir}/corosync/cpg.h
 %{_includedir}/corosync/hdb.h
 %{_includedir}/corosync/sam.h
 %{_includedir}/corosync/quorum.h
 %{_includedir}/corosync/votequorum.h
 %dir %{_includedir}/corosync/totem/
 %{_includedir}/corosync/totem/totem.h
 %{_includedir}/corosync/totem/totemip.h
 %{_includedir}/corosync/totem/totempg.h
 %{_libdir}/libcfg.so
 %{_libdir}/libcpg.so
 %{_libdir}/libcmap.so
 %{_libdir}/libtotem_pg.so
 %{_libdir}/libquorum.so
 %{_libdir}/libvotequorum.so
 %{_libdir}/libsam.so
 %{_libdir}/libcorosync_common.so
 %{_libdir}/pkgconfig/*.pc
 %{_mandir}/man3/cpg_*3*
 %{_mandir}/man3/quorum_*3*
 %{_mandir}/man3/votequorum_*3*
 %{_mandir}/man3/sam_*3*
 %{_mandir}/man8/cpg_overview.8*
 %{_mandir}/man8/votequorum_overview.8*
 %{_mandir}/man8/sam_overview.8*
 %{_mandir}/man3/cmap_*3*
 %{_mandir}/man8/cmap_overview.8*
 %{_mandir}/man8/quorum_overview.8*
 
 # optional qdevices
 #
 %if %{with qdevices}
 
 %package -n corosync-qdevice
 Summary: The Corosync Cluster Engine Qdevice
 Group: System Environment/Base
 Requires: corosync
 Requires: nss-tools
 
 %if %{with systemd}
 Requires(post): systemd
 Requires(preun): systemd
 Requires(postun): systemd
 %endif
 
 %description -n corosync-qdevice
 This package contains the Corosync Cluster Engine Qdevice, script for creating
 NSS certificates and an init script.
 
 %post -n corosync-qdevice
 %if %{with systemd} && 0%{?systemd_post:1}
 %systemd_post corosync-qdevice.service
 %else
 if [ $1 -eq 1 ]; then
 	/sbin/chkconfig --add corosync-qdevice || :
 fi
 %endif
 
 %preun -n corosync-qdevice
 %if %{with systemd} && 0%{?systemd_preun:1}
 %systemd_preun corosync-qdevice.service
 %else
 if [ $1 -eq 0 ]; then
 	/sbin/service corosync-qdevice stop &>/dev/null || :
 	/sbin/chkconfig --del corosync-qdevice || :
 fi
 %endif
 
 %postun -n corosync-qdevice
 %if %{with systemd} && 0%{?systemd_postun:1}
 %systemd_postun
 %endif
 
 %files -n corosync-qdevice
 %defattr(-,root,root,-)
 %dir %{_sysconfdir}/corosync/qdevice
 %dir %config(noreplace) %{_sysconfdir}/corosync/qdevice/net
 %dir %{_localstatedir}/run/corosync-qdevice
 %{_sbindir}/corosync-qdevice
 %{_sbindir}/corosync-qdevice-net-certutil
 %{_sbindir}/corosync-qdevice-tool
+%config(noreplace) %{_sysconfdir}/sysconfig/corosync-qdevice
 %if %{with systemd}
 %{_unitdir}/corosync-qdevice.service
 %dir %{_datadir}/corosync
 %{_datadir}/corosync/corosync-qdevice
 %else
 %{_initrddir}/corosync-qdevice
 %endif
 
 %endif
 
 # optional qnetd
 #
 %if %{with qnetd}
 
 %package -n corosync-qnetd
 Summary: The Corosync Cluster Engine Qdevice Network Daemon
 Group: System Environment/Base
 Requires: nss-tools
 Requires(pre): shadow-utils
 
 %if %{with systemd}
 Requires(post): systemd
 Requires(preun): systemd
 Requires(postun): systemd
 %endif
 
 %description -n corosync-qnetd
 This package contains the Corosync Cluster Engine Qdevice Network Daemon, script for creating
 NSS certificates and an init script.
 
 %pre -n corosync-qnetd
 getent group coroqnetd >/dev/null || groupadd -r coroqnetd
 getent passwd coroqnetd >/dev/null || \
     useradd -r -g coroqnetd -d / -s /sbin/nologin -c "User for corosync-qnetd" coroqnetd
 exit 0
 
 %post -n corosync-qnetd
 %if %{with systemd} && 0%{?systemd_post:1}
 %systemd_post corosync-qnetd.service
 %else
 if [ $1 -eq 1 ]; then
 	/sbin/chkconfig --add corosync-qnetd || :
 fi
 %endif
 
 %preun -n corosync-qnetd
 %if %{with systemd} && 0%{?systemd_preun:1}
 %systemd_preun corosync-qnetd.service
 %else
 if [ $1 -eq 0 ]; then
 	/sbin/service corosync-qnetd stop &>/dev/null || :
 	/sbin/chkconfig --del corosync-qnetd || :
 fi
 %endif
 
 %postun -n corosync-qnetd
 %if %{with systemd} && 0%{?systemd_postun:1}
 %systemd_postun
 %endif
 
 %files -n corosync-qnetd
 %defattr(-,root,root,-)
 %dir %config(noreplace) %attr(770, coroqnetd, coroqnetd) %{_sysconfdir}/corosync/qnetd
 %dir %attr(770, coroqnetd, coroqnetd) %{_localstatedir}/run/corosync-qnetd
 %{_bindir}/corosync-qnetd
 %{_bindir}/corosync-qnetd-certutil
 %{_bindir}/corosync-qnetd-tool
 %config(noreplace) %{_sysconfdir}/sysconfig/corosync-qnetd
 %if %{with systemd}
 %{_unitdir}/corosync-qnetd.service
 %dir %{_datadir}/corosync
 %{_datadir}/corosync/corosync-qnetd
 %else
 %{_initrddir}/corosync-qnetd
 %endif
 
 %endif
 
 %changelog
 * @date@ Autotools generated version <nobody@nowhere.org> - @version@-1-@numcomm@.@alphatag@.@dirty@
 - Autotools generated version
diff --git a/init/Makefile.am b/init/Makefile.am
index 7c1a556d..cc666e68 100644
--- a/init/Makefile.am
+++ b/init/Makefile.am
@@ -1,88 +1,89 @@
 # Copyright (c) 2004 MontaVista Software, Inc.
 # Copyright (c) 2009 Red Hat, Inc.
 #
 # Authors: Steven Dake (sdake@redhat.com)
 #          Fabio M. Di Nitto (fdinitto@redhat.com)
 #
 # All rights reserved.
 #
 # This software licensed under BSD license, the text of which follows:
 #
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions are met:
 #
 # - Redistributions of source code must retain the above copyright notice,
 #   this list of conditions and the following disclaimer.
 # - Redistributions in binary form must reproduce the above copyright notice,
 #   this list of conditions and the following disclaimer in the documentation
 #   and/or other materials provided with the distribution.
 # - Neither the name of the MontaVista Software, Inc. nor the names of its
 #   contributors may be used to endorse or promote products derived from this
 #   software without specific prior written permission.
 #
 # THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
 # AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
 # IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
 # ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
 # LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
 # CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
 # SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
 # INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
 # CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
 # ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
 # THE POSSIBILITY OF SUCH DAMAGE.
 
 MAINTAINERCLEANFILES	= Makefile.in
 
 EXTRA_DIST		= corosync.in corosync-notifyd.in corosync.service.in \
                           corosync-notifyd.service.in corosync.conf.in corosync-notifyd.conf.in \
                           corosync.sysconfig.example
 
 if INSTALL_SYSTEMD
 systemdconfdir	   = $(SYSTEMDDIR)
 systemdconf_DATA   = corosync.service corosync-notifyd.service
 initscriptdir	   = $(INITWRAPPERSDIR)
 else
 initscriptdir	   = $(INITDDIR)
 endif
 initscript_SCRIPTS  = corosync corosync-notifyd
 
 if BUILD_QDEVICES
 initscript_SCRIPTS  += corosync-qdevice
-EXTRA_DIST          += corosync-qdevice.in corosync-qdevice.service.in
+EXTRA_DIST          += corosync-qdevice.sysconfig.example corosync-qdevice.in \
+                       corosync-qdevice.service.in
 if INSTALL_SYSTEMD
 systemdconf_DATA   += corosync-qdevice.service
 endif
 endif
 
 if BUILD_QNETD
 initscript_SCRIPTS  += corosync-qnetd
 EXTRA_DIST          += corosync-qnetd.sysconfig.example corosync-qnetd.in \
                        corosync-qnetd.service.in
 if INSTALL_SYSTEMD
 systemdconf_DATA   += corosync-qnetd.service
 endif
 endif
 
 if INSTALL_UPSTART
 upstartconfdir     = $(UPSTARTDIR)
 upstartconf_DATA   = corosync.conf corosync-notifyd.conf
 endif
 
 %: %.in Makefile
 	rm -f $@-t $@
 	cat $< | sed \
 		-e 's#@''SBINDIR@#$(sbindir)#g' \
 		-e 's#@''BINDIR@#$(bindir)#g' \
 		-e 's#@''SYSCONFDIR@#$(sysconfdir)#g' \
 		-e 's#@''INITDDIR@#$(INITDDIR)#g' \
 		-e 's#@''INITWRAPPERSDIR@#$(INITWRAPPERSDIR)#g' \
 		-e 's#@''LOCALSTATEDIR@#$(localstatedir)#g' \
 		-e 's#@''BASHPATH@#${BASHPATH}#g' \
 	    > $@-t
 	mv $@-t $@
 
 all-local: $(initscript_SCRIPTS) $(systemdconf_DATA) $(upstartconf_DATA)
 
 clean-local:
 	rm -rf $(initscript_SCRIPTS) $(systemdconf_DATA) $(upstartconf_DATA)
diff --git a/init/corosync-qdevice.in b/init/corosync-qdevice.in
index ebafe416..9aa42ef8 100755
--- a/init/corosync-qdevice.in
+++ b/init/corosync-qdevice.in
@@ -1,164 +1,164 @@
 #!@BASHPATH@
 
 # Authors:
 #  Jan Friesse <jfriesse@redhat.com>
 #
 # License: Revised BSD
 
 # chkconfig: - 20 80
 # description: Corosync Qdevice daemon
 # processname: corosync-qdevice
 #
 ### BEGIN INIT INFO
 # Provides:		corosync-qdevice
 # Required-Start:	$corosync
 # Required-Stop:	$corosync
 # Default-Start:
 # Default-Stop:
 # Short-Description:	Starts and stops Corosync Qdevice daemon.
 # Description:		Starts and stops Corosync Qdevice daemon.
 ### END INIT INFO
 
 desc="Corosync Qdevice daemon"
 prog="corosync-qdevice"
 
 # set secure PATH
 PATH="/sbin:/bin:/usr/sbin:/usr/bin:@SBINDIR@"
 
 success()
 {
 	echo -ne "[  OK  ]\r"
 }
 
 failure()
 {
 	echo -ne "[FAILED]\r"
 }
 
 status()
 {
 	pid=$(pidof $1 2>/dev/null)
 	res=$?
 	if [ $res -ne 0 ]; then
 		echo "$1 is stopped"
 	else
 		echo "$1 (pid $pid) is running..."
 	fi
 	return $res
 }
 
 # rpm based distros
 if [ -d @SYSCONFDIR@/sysconfig ]; then
 	[ -f @INITDDIR@/functions ] && . @INITDDIR@/functions
 	[ -f @SYSCONFDIR@/sysconfig/$prog ] && . @SYSCONFDIR@/sysconfig/$prog
 	[ -z "$LOCK_FILE" ] && LOCK_FILE="@LOCALSTATEDIR@/lock/subsys/$prog"
 fi
 
 # deb based distros
 if [ -d @SYSCONFDIR@/default ]; then
 	[ -f @SYSCONFDIR@/default/$prog ] && . @SYSCONFDIR@/default/$prog
 	[ -z "$LOCK_FILE" ] && LOCK_FILE="@LOCALSTATEDIR@/lock/$prog"
 fi
 
 # The version of __pids_pidof in /etc/init.d/functions calls pidof with -x
 # This means it matches scripts, including this one.
 # Redefine it here so that status (from the same file) works.
 # Otherwise simultaneous calls to stop() will loop forever
 __pids_pidof() {
         pidof -c -o $$ -o $PPID -o %PPID "$1" || \
                 pidof -c -o $$ -o $PPID -o %PPID "${1##*/}"
 }
 
 cluster_disabled_at_boot()
 {
        if grep -q nocluster /proc/cmdline && \
           [ "$(tty)" = "/dev/console" ]; then
                echo -e "not configured to run at boot"
                failure
                return 1
        fi
        return 0
 }
 
 start()
 {
 	echo -n "Starting $desc ($prog): "
 
 	! cluster_disabled_at_boot && return
 
 	# most recent distributions use tmpfs for @LOCALSTATEDIR@/run
 	# to avoid to clean it up on every boot.
 	# they also assume that init scripts will create
 	# required subdirectories for proper operations
 	mkdir -p @LOCALSTATEDIR@/run
 
 	if status $prog > /dev/null 2>&1; then
 		success
 	else
-		$prog $COROSYNC_QNETD_OPTIONS > /dev/null 2>&1
+		$prog $COROSYNC_QDEVICE_OPTIONS > /dev/null 2>&1
 
 		if [ "$?" != 0 ]; then
 			failure
 			rtrn=1
 		else
 			touch $LOCK_FILE
 			success
 		fi
 	fi
 	echo
 }
 
 stop()
 {
 	! status $prog > /dev/null 2>&1 && return
 
 	echo -n "Signaling $desc ($prog) to terminate: "
 	kill -TERM $(pidof $prog) > /dev/null 2>&1
 	success
 	echo
 
 	echo -n "Waiting for $prog services to unload:"
 	while status $prog > /dev/null 2>&1; do
 		sleep 1
 		echo -n "."
 	done
 
 	rm -f $LOCK_FILE
 	success
 	echo
 }
 
 restart()
 {
 	stop
 	start
 }
 
 rtrn=0
 
 case "$1" in
 start)
 	start
 ;;
 restart|reload|force-reload)
 	restart
 ;;
 condrestart|try-restart)
 	if status $prog > /dev/null 2>&1; then
 		restart
 	fi
 ;;
 status)
 	status $prog
 	rtrn=$?
 ;;
 stop)
 	stop
 ;;
 *)
 	echo "usage: $0 {start|stop|restart|reload|force-reload|condrestart|try-restart|status}"
 	rtrn=2
 ;;
 esac
 
 exit $rtrn
diff --git a/init/corosync-qdevice.sysconfig.example b/init/corosync-qdevice.sysconfig.example
new file mode 100644
index 00000000..8cac8184
--- /dev/null
+++ b/init/corosync-qdevice.sysconfig.example
@@ -0,0 +1,6 @@
+# Corosync Qdevice daemon init script configuration file
+
+# COROSYNC_QDEVICE_OPTIONS specifies options passed to corosync-qdevice command
+# (default is no options).
+# See "man corosync-qdevice" for detailed descriptions of the options.
+COROSYNC_QDEVICE_OPTIONS=""