diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..ca365aa
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,36 @@
+# Compiled Object files
+*.slo
+*.lo
+*.o
+*.obj
+
+# Precompiled Headers
+*.gch
+*.pch
+
+# Compiled Dynamic libraries
+*.so
+*.dylib
+*.dll
+
+# Fortran module files
+*.mod
+*.smod
+
+# Compiled Static libraries
+*.lai
+*.la
+*.a
+*.lib
+
+# Executables
+*.exe
+*.out
+*.app
+
+# Archives
+*.zip
+
+# Swap files
+*.swp
+
diff --git a/SPECS/asmdisks.spec b/asmdisks.spec
similarity index 89%
rename from SPECS/asmdisks.spec
rename to asmdisks.spec
index 99d6f42..a436472 100644
--- a/SPECS/asmdisks.spec
+++ b/asmdisks.spec
@@ -1,6 +1,6 @@
 Name:		asmdisks
 Summary:	Replacement for Oracle ASMLib using UDEV
-Version:	1.4.4
+Version:	1.4.5
 Release:	1%{?prerel:.~%prerel}
 BuildArch:	noarch
 License:	GPLv3+
@@ -25,7 +25,7 @@ Also supports EMC Powerpath and EMC DSSD volumes.
 rm -rf %{buildroot}
 mkdir %{buildroot}
 
-%makeinstall
+%make_install
 
 %files
 %defattr(0444,root,root)
@@ -33,9 +33,7 @@ mkdir %{buildroot}
 %doc /usr/share/doc/%{name}/README
 %defattr(0644,root,root)
 /etc/bash_completion.d/asm.bash
-/usr/share/man/man1/asm.1.gz
-/usr/share/man/man1/asmstat.1.gz
-/usr/share/man/man1/wipedisk.1.gz
+/usr/share/man/man1/*.gz
 %defattr(0755,root,root)
 /usr/bin/asm
 /usr/bin/asmstat
diff --git a/src/Makefile b/src/Makefile
index 0359e2b..5d70374 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -4,35 +4,37 @@
 # Author      : Bart Sjerps <bart@outrun.nl>
 # License     : GPLv3+
 # ---------------------------------------------------------------------------
+NAME      := $(RPM_PACKAGE_NAME)
+VERSION    = $(shell rpm -q --qf '%{version}\n' --specfile ../$(NAME).spec)
+SRCDIR     = $(shell rpm --eval %_sourcedir)
 
-version    = 1.4.4
-prefix     = /usr/local
-bindir     = $(prefix)/bin
-mandir     = $(prefix)/share/man
-docdir     = $(prefix)/share/doc
+files     := $(shell find files/ -type f | cut -d/ -f2-)
+dirs      := $(shell find files/ -type d | cut -d/ -f2-)
 
-sysconfdir = /etc
+man1       = $(wildcard bin/*)
+man8       = $(wildcard sbin/*)
 
-all:
-
-src:
-	tar -jcvf $(HOME)/SOURCES/asmdisks-$(version).tbz2 --transform "s|^|asmdisks/|" *
+man1dir    = $(DESTDIR)/usr/share/man/man1
+man8dir    = $(DESTDIR)/usr/share/man/man8
 
-rpm:	src
-	cd ../SPECS ; rpmbuild -ba asmdisks.spec
+.PHONY: all install man
 
-install:
-	install -d 0755 $(bindir)
-	install -d 0755 $(sysconfdir)/bash_completion.d
-	install -d 0755 $(mandir)/man1
-	install -d 0755 $(docdir)/asmdisks
-	install -m 0755 bin/asm bin/asmstat bin/diskheader bin/wipedisk $(bindir)
-	install -m 0644 bin/asm.bash $(sysconfdir)/bash_completion.d
-	install -m 0644 man/* $(mandir)/man1/
-	install -m 0444 doc/* $(docdir)/asmdisks/
-
-clean:
-	rm $(HOME)/SOURCES/asmdisks-$(version).tbz2
+all:
 
-.PHONY: install
+man:
+	install -m 0755 -d $(man1dir)
+	install -m 0755 -d $(man8dir)
+	$(foreach exe,$(man1),$(exe) --mandump > $(man1dir)/$(notdir $(exe)).1 ;echo mandump $(exe);)
+	$(foreach exe,$(man8),$(exe) --mandump > $(man8dir)/$(notdir $(exe)).8 ;echo mandump $(exe);)
+	find $(man1dir) $(man8dir) -type f | xargs -L1 gzip
+
+install: man
+	install -d 0755 $(DESTDIR)/usr/bin
+	install -d 0755 $(DESTDIR)/usr/share/doc/asmdisks
+	
+	install -m 0755 -pt $(DESTDIR)/usr/bin bin/*
+	install -m 0755 -pt $(DESTDIR)/usr/share/doc/asmdisks doc/*
+	
+	for d in $(dirs); do install -m 0755 -d $(DESTDIR)/$$d ; done
+	for f in $(files); do install -m 0644 -pt $(DESTDIR)/$$(dirname $$f)/ files/$$f ; done
 
diff --git a/src/bin/asm b/src/bin/asm
index aee101c..eb33ff2 100755
--- a/src/bin/asm
+++ b/src/bin/asm
@@ -3,6 +3,8 @@
 # Title       : asm
 # Description : Manage disks and volumes for Oracle ASM
 # Author      : Bart Sjerps <bart@outrun.nl>
+# Version     : 1
+# Manual      : asmdisks
 # License     : GPLv3+
 # ---------------------------------------------------------------------------
 # This program is free software: you can redistribute it and/or modify
@@ -17,6 +19,7 @@
 # more details.
 # ---------------------------------------------------------------------------
 # Revision history:
+# 2018-08-20 : Embedded manpage
 # 2018-04-06 : Add $PATH to support remote and scripted execution
 # 2017-12-14 : Bugfix for import function
 # 2017-10-04 : Bugfix for SCSI id's with whitespace (Linux TGTD)
@@ -33,9 +36,6 @@
 # 2014-11-06 : Added import, rename and -h/-? option
 # 2014-10-22 : Created
 # ---------------------------------------------------------------------------
-# Additional info:
-# Man page:          : Yes
-# Bash completion    : Yes
 #============================================================================
 # Configuration parameters:
 # ---------------------------------------------------------------------------
@@ -59,24 +59,266 @@ trap "cleanup" EXIT INT TERM HUP
 # ---------------------------------------------------------------------------
 usage() {
   cat <<- EOF
-	Usage: $(basename $0) [-n] [-t] <command> <args>
-	
-	-n - no headings
-	-t - use TAB separator (for scripting) instead of column formatted (implies -n)
-	
-	Actions:
-	createdisk <label> <device> - adds a disk under /dev/<diskstring>/label
-	deletedisk <label>          - deletes the disk (really gone after reboot)
-	renamedisk <label> <new>    - renames the disk (beware if disk is in use!)
-	rescan    - probes for new SCSI devices (after adding disks with VMware)
-	scandisks - processes any changes in asmtab, creates new UDEV rules
-	disks     - shows all SCSI disks, SCSI connections, size and path
-	list      - show all devices currently configured under /dev/oracleasm
-	multi     - list multipath devices
-	import    - Imports all ASM disks as vol01, vol02...
-	dump      - Shows the contents of $rulesfile
+	Usage: $(basename $0) [-n] [-t] <command> [args]
+	
+	@B asm
+	is a replacement for the
+	@B oracleasm
+	command provided via Oracle ASMlib. It attempts to provide similar functionality using a simple script
+	and Linux UDEV rather than tweaking the kernel with an add-on kernel module,
+	complex configuration and binary files.
+	
+	It will create block devices from disks, partitions or mapper devices,
+	under /dev/oracleasm/ (default) for use with Oracle and changes permissions to
+	grid:asmdba to allow Oracle ASM read/write access to those disks (only).
+	Mapper devices can be multipath devices, LVM logical volumes, or any other
+	block device managed by Linux device-mapper.
+	
+	The administration of those files is done through the
+	@I /etc/asmtab
+	configuration file, which holds the asmdisks volume name, volume type,
+	and the identifier, to provide persistent naming across reboots
+	and reconfiguration. You may manually edit this file if so needed. The
+	@B UDEV
+	configuration in /etc/udev/rules.d/ is built from the definitions in asmtab.
+	@P
+	This tool is completely out-of-band, which means it is only used for generating
+	and activating the udev rules file and does nothing until an administrator runs
+	the tool. You may even remove asmdisks and the configuration will still keep working.
+
+	Options:
+	 -n   no headings
+	
+	 -t   use TAB separator (for scripting) instead of column formatted (implies -n)
+	
+	 rescan  lets the kernel probe for new SCSI devices (after hot-adding disks)
+	
+	 createdisk <label> <block device>  adds a disk as /dev/oracleasm/<label>
+	 If you want the disk to appear under another path (such as /dev/iorate) then use
+	 the relative path as label (i.e. asm createdisk iorate/vol1 <id>)
+	 The block device can be a raw disk (i.e. /dev/sdX), a previously created (empty)
+	 disk partition (/dev/sdX1), or a device-mapper block device, to be specified as
+	 any mapper device that points to the correct /dev/dm-X device,
+	 such as LVM logical volumes (i.e. /dev/myvg/lvol1), multipath devices (/dev/mapper/mpathX)
+	 etc. "asm" will attempt to figure out the type of device and specify the correct ID in asmtab.
+	
+	 deletedisk <label>  deletes the disk from /dev/<diskstring>/.
+	 It will not be completely removed but re-appear
+	 as /dev/sdX or /dev/dm-X etc. Be careful, if the disk is still in use it could
+	 result in I/O errors and even dataloss.
+	
+	 renamedisk <label> <new>      renames the disk (beware if disk is in use!)
+	 
+	 scandisks   processes any changes in asmtab, creates new UDEV rules
+	 (run it after createdisk/deletedisk to
+	 activate your changes). It's called automatically after createdisk/deletedisk actions.
+
+	 disks       shows all SCSI disks, SCSI connections, size and path
+	 also shows SCSI addresses (handy for figuring out which VMDK / iSCSI / etc volume is used)
+	
+	 multi       list multipath devices
+	
+	 list        show all devices currently configured under /dev/oracleasm
+	
+	 import      Imports all volumes from /dev/sd* that are labeled as ASMdisk
+	 i.e. they have an Oracle ASM disk signature created by another host (cloning) or another node (RAC. 
+	 It simply imports volumes as vol01, vol02, etc. 
+	 as ASM does not care what the Linux device name looks like anyway.
+	
+	 dump  Shows the contents of $rulesfile
+	*SCSI UUID*
+	The scsi identifier is retrieved via the
+	@B scsi_id(8)
+	command and depends on the OS and hardware layer to provide this.
+	The VMware default (all products) is to have this ID disabled. It must be re-enabled with
+	@P
+	@B disk.EnableUUID = "TRUE"
+	@P
+	in the VM's VMX configuration file.
+	This tool will not work without this setting.  You may verify if that works using the command
+	@br
+	@B scsi_id --whitelisted /dev/sda
+	@br
+	or running "asm" without options (it will complain if /dev/sda does not show a SCSI identifier).
+	
+	*DISKSTRINGS*
+	The default diskstring under which new volumes are placed is /dev/oracleasm/ with
+	ownership grid:asmdba and mode 0660.
+	@br
+	You may want to configure volumes elsewhere and with different permissions. If you specify a
+	relative path as volume name then the volume will be configured under /dev/<path>/name,
+	for example "iorate/vol1" will appear as /dev/iorate/vol1.
+	The permissions will be the default (grid:asmdba) unless an entry for the new diskstring
+	is defined in asmtab (needs to be done manually). At initial creation, "asm" defines
+	one special case (in asmtab) for iorate:
+	@nf
+	PATH=iorate:root:iops:0660
+	@fi
+	This means if you create volumes as iorate/<volname> they will have permissions root:iops @ mode 0660.
+	This allows the IORate tool to run under userid "iorate" having group membership "iops" with access
+	to those devices - without giving the user full access to all disks (such as by making it
+	a member of the "disk" group). This prevents IORate to accidentally overwrite OS or ASM
+	devices (when using the iorate RPM package, that is). IORate will only have direct access
+	to volumes under /dev/iorate.
+	ASM will fall back to grid:asmdba if the specified user/group does not exist.
+	Another purpose for having an additional diskstring is if you want to run more
+	than one Oracle ASM instance - each can have it's own diskstring and permissions.
+	The default grid:asmdba owner/group can be altered by setting
+	@br
+	PATH=oracleasm:user:group:mode in the asmtab file.
+	
+	*ASMTAB file format*
+	Define all non-default diskstrings as
+	@nf
+	
+	PATH=<diskstring>:<owner>:<group>:<mode>
+	
+	@fi
+	Non-defined diskstrings will have default ownerships/modes.
+	@br
+	For every volume to be defined, register one entry in asmtab as
+	@nf
+	
+	<diskstring/volumename> <type> <id>
+	
+	@fi
+	diskstring may be omitted (defaults to "oracleasm"). Type is currently either "scsi" or "mapper".
+	@br
+	id is either a scsi_identifier (such as SCSI device "36000c29f825cd85b5fcc70a1aadebf0c" or
+	iSCSI id "1IET_00010001") or a similar identifier appended with :<partnum>,
+	such as "36000c29f825cd85b5fcc70a1aadebf0c:2" indicating the 2nd partition on that
+	SCSI disk, or a name as it appears under /dev/mapper/ such as /dev/mapper/myvg-vol1.
+	@br
+	Normally you should not have to edit asmtab manually, however in some cases it may become handy.
+	
+	*Supported disk types*
+	asmdisks currently supports the following block device types:
+	@P
+	- Plain SCSI disk (/dev/sd*)
+	@br
+	- Linux Multipath (/etc/multipath/*, multipath -ll)
+	@br
+	- Linux Logical Volumes (/dev/vgname/lvname)
+	@br
+	- DellEMC Powerpath (/dev/power*)
+	@br
+	- DellEMC ScaleIO (/dev/scini*)
+	@br
+	
+	*RAC and Clusterware*
+	Be aware that Oracle RAC requires shared devices as ASM volumes. This means running
+	RAC with anything else than full SCSI disks or SCSI disk partitions will not work.
+	
+	*Files*
+	/etc/asmtab
+	@br
+	/dev/oracleasm/
+	@br
+	/dev/iorate/
+	@br
+	/etc/udev/rules.d/99-asm.rules
+	@br
+	/etc/scsi_id.config
+	
+	*RAW SCSI disks or disk partitions*
+	Many administrators prefer to create a primary partition first on each disk,
+	then use that for ASM (this is the standard way of using disks with Oracle ASMLib).
+	My preference is to hand full disks (not partitioned) to ASM. By using "asm"
+	the risk of a rookie administrator creating filesystems or anything else on that disk
+	is virtually eliminated, because the disk device is removed from /dev/sdXX,
+	and reappears as /dev/oracleasm/volXX. An admin who would still create a filesystem on
+	such a device should be sent back to basic UNIX administration training.
+	Using full disks eliminates the need for disk alignment and some extra administration steps.
+	@P
+	Note that with Enterprise Linux 7 this feature of udev no longer works and the only option
+	is to add symlinks to devices in /dev/ so this is now the standard behaviour of asmdisks.
+	
+	*bash completion*
+	If you have the package bash-completion installed, you may use TAB to show possible
+	command options or auto-complete things like disk and volume names.
+	
+	*use in scripts*
+	If you want to parse the output of "asm" (list/disks) for usage in scripts, you can use the "-t"
+	option so that the output is TAB separated instead of column formatted.
+	@br
+	In future versions, the columns and output order may change.
+	
+	*boot disk protection*
+	asmdisks attempts to detect which disk is used as bootdisk and prevent messing with this disk directly.
+	In some cases the detection fails. You may add the bootdisk to /etc/asmtab manually.
+	
+	*Known issues*
+	- Modifying the UDEV config requires running "udevadm trigger" which in turn triggers network reconfiguration.
+	A known issue when using DHCP is that the network scripts attempt to start a 2nd dhclient - which fails and
+	results in errors in the syslog. You can safely ignore these.
+	@br
+	- Enabling or disabling Linux Multipath may require a reboot to prevent strange asmdisks behaviour.
+	
+	*Bugs*
+	Likely. Currently "asm" does not do a lot of validation checking so in classic UNIX style, it offers
+	many ways to mess up. Especially via directly editing asmtab. You have been warned.
+	@br
+	That said, asm is "out of band", in other words it is not required for correct presentation of
+	ASM devices. You could deinstall asmdisks, reboot and the ASM volumes would still be there (because of
+	the 99-asm.rules UDEV file). In the end, "asm" only manages this file and you may verify at any time
+	if the contents are correct or make backup copies of the file at any time.
+	@br
+	Note that to avoid potential problems with boot devices, /dev/sda is excluded from
+	any manipulation (I learned the hard way ;)
+	@br
+	So even if you mess up, you should be able to boot and fix problems by removing/restoring
+	99-asm.rules followed by "udevadm trigger" to reset udev.
+	Then fix issues in asmtab and retry "asm scandisks".
+	@P
+	EMC Powerpath has not yet been fully tested with asm, but this would
+	only be required for physically deployed hosts. Likewise for non-standard SCSI devices such as
+	paravirtualized devices, or any other disk type that shows up different from what is expected.
+	@br
+	Roughly speaking, any device that shows up as /dev/sdXX in Linux (i.e. it is an "sd" device type) should work.
+	If you want support for another non-standard device type, let me know and I will see if it's possible to add support.
+	
+	*See also*
+	wipedisk(1), asmstat(1), udev(7), udevadm(8), scsi_id(8)
+
 	EOF
 }
+version() {
+  local version=$(awk -F: '/^# Version / {sub(/ /,"",$NF) ; print $NF}' $0)
+  local author=$(awk -F: '/^# Author / {sub(/ /,"",$NF) ; print $NF}' $0)
+  local license=$(awk -F: '/^# License / {sub(/ /,"",$NF) ; print $NF}' $0)
+  case $license in
+    GPLv3+) local ltext="License GPLv3+: GNU GPL version 3 or later <http://gnu.org/licenses/gpl.html>." ;;
+    *)      local ltext="license $license (unknown)"
+  esac
+  cat <<- EOF
+	$(basename $0) ${version:-0.0}
+	Written by ${author:-<No Author>}, ${ltext}
+	@br
+	If you have suggestions for improvements in this tool, please send them along via the above address.
+	
+	Copyright (c) 2018 ${author% <*}
+	EOF
+  echo @br
+  echo This is free software: you are free to change and redistribute it.  There is NO WARRANTY, to the extent permitted by law.
+}
+
+mandump() {
+  test -x /usr/bin/help2man || exit 10
+  local desc=$(awk -F: '/^# Description/ {sub(/ /,"",$NF) ; print $NF; exit}' $0)
+  local sect=$(awk -F: '/^# Section/     {sub(/ /,"",$NF) ; print $NF; exit}' $0)
+  local manual=$(awk -F: '/^# Manual/    {sub(/ /,"",$NF) ; print $NF; exit}' $0)
+  local source=$(awk -F: '/^# Source/    {sub(/ /,"",$NF) ; print $NF; exit}' $0)
+  SOURCE_DATE_EPOCH=$(stat -c %Y $0); export SOURCE_DATE_EPOCH
+  help2man -N -n "$desc" -s "${sect:-1}" -S "${source:-Outrun}" -m "${manual:-Outrun manual}" $0 | sed "s/^@/\./"
+}
+
+case $1 in
+  -\?)       man $(basename $0) ; exit;;
+  --help)    usage   ; exit ;;
+  --version) version ; exit ;;
+  --mandump) mandump ; exit ;;
+esac
+
 #============================================================================
 # Functions
 # ---------------------------------------------------------------------------
diff --git a/src/bin/asmstat b/src/bin/asmstat
index 7c97583..e2175e0 100755
--- a/src/bin/asmstat
+++ b/src/bin/asmstat
@@ -1,9 +1,11 @@
 #!/bin/bash
 #============================================================================
-# Title              : asmstat
-# Description        : Wrapper for iostat that maps ASM devices
-# Author             : Bart Sjerps <bart@outrun.nl>
-# License            : GPLv3+
+# Title       : asmstat
+# Description : Wrapper for iostat that maps ASM devices
+# Author      : Bart Sjerps <bart@outrun.nl>
+# Version     : 1
+# Manual      : asmdisks
+# License     : GPLv3+
 # ---------------------------------------------------------------------------
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -39,23 +41,72 @@ sedstring="/dm-/d;/scd/d;"
 # ---------------------------------------------------------------------------
 usage() {
   cat <<- EOF
-	$(basename $0) [ options ]
+	Usage: $(basename $0) [ options ]
 	
 	A wrapper for iostat that translates /dev/sdXX devices into their
-	ASM device names. Example: asmstat -xm 2
-	Any options will be directly passed on to iostat.
-	See man asmstat(1) and asm(1) for more info.
+	ASM device names.  Any options will be directly passed on to iostat.
 	
+	It  uses  sed(1) to filter mapper devices and replace /dev/sdX devices
+	with /dev/oracleasm/volX so it shows more meaningful output than
+	plain iostat when using with asm(1)
+
+	Options:
+	The options are passed straight to iostat(1) and therefore 100% equal.
+	
+	*Example*
+	asmstat -xm 2
+	
+	shows IO performance statistics for ASM and generic disk devices every two seconds.
+	
+	*Files*
+	/dev/oracleasm
+	
+	*See also*
+	iostat(1), asm(1)
+	
+	EOF
+}
+version() {
+  local version=$(awk -F: '/^# Version / {sub(/ /,"",$NF) ; print $NF}' $0)
+  local author=$(awk -F: '/^# Author / {sub(/ /,"",$NF) ; print $NF}' $0)
+  local license=$(awk -F: '/^# License / {sub(/ /,"",$NF) ; print $NF}' $0)
+  case $license in
+    GPLv3+) local ltext="License GPLv3+: GNU GPL version 3 or later <http://gnu.org/licenses/gpl.html>." ;;
+    *)      local ltext="license $license (unknown)"
+  esac
+  cat <<- EOF
+	$(basename $0) ${version:-0.0}
+	Written by ${author:-<No Author>}, ${ltext}
+	@br
+	If you have suggestions for improvements in this tool, please send them along via the above address.
+	
+	Copyright (c) 2018 ${author% <*}
 	EOF
+  echo @br
+  echo This is free software: you are free to change and redistribute it.  There is NO WARRANTY, to the extent permitted by law.
 }
+
+mandump() {
+  test -x /usr/bin/help2man || exit 10
+  local desc=$(awk -F: '/^# Description/ {sub(/ /,"",$NF) ; print $NF; exit}' $0)
+  local sect=$(awk -F: '/^# Section/     {sub(/ /,"",$NF) ; print $NF; exit}' $0)
+  local manual=$(awk -F: '/^# Manual/    {sub(/ /,"",$NF) ; print $NF; exit}' $0)
+  local source=$(awk -F: '/^# Source/    {sub(/ /,"",$NF) ; print $NF; exit}' $0)
+  SOURCE_DATE_EPOCH=$(stat -c %Y $0); export SOURCE_DATE_EPOCH
+  help2man -N -n "$desc" -s "${sect:-1}" -S "${source:-Outrun}" -m "${manual:-Outrun manual}" $0 | sed "s/^@/\./"
+}
+
+case $1 in
+  -\?)       man $(basename $0) ; exit;;
+  --help)    usage   ; exit ;;
+  --version) version ; exit ;;
+  --mandump) mandump ; exit ;;
+esac
+
+
 #============================================================================
 # Main
 # ---------------------------------------------------------------------------
-# Normal getopts doesn't work as we need to pass everything to iostat...
-case $1 in
-  -h)	usage ; exit 0 ;;
-  -?)   usage ; exit 0 ;;
-esac
 
 if ! ls /dev/oracleasm/* &>/dev/null ; then
   iostat $@
diff --git a/src/bin/diskheader b/src/bin/diskheader
index 0277208..9148c8a 100755
--- a/src/bin/diskheader
+++ b/src/bin/diskheader
@@ -3,6 +3,8 @@
 # Title       : diskheader
 # Description : Shows hexdump of the first 1k block of a disk
 # Author      : Bart Sjerps <bart@outrun.nl>
+# Version     : 1.0
+# Manual      : asmdisks
 # License     : GPLv3+
 # ---------------------------------------------------------------------------
 # This program is free software: you can redistribute it and/or modify
@@ -33,15 +35,54 @@ test -x /usr/bin/xxd || die "Requires xxd (vim-common)"
 # ---------------------------------------------------------------------------
 usage() {
   cat <<- EOF
-	$(basename $0) [-c blocks] [-w width] <disk>
+	Usage: $(basename $0) [-c blocks] [-w width] <disk>
 	
 	Shows a hexdump of the header of the given disk.
 	
-	  -c blocks - show <blocks> (default 1 block of 1024 bytes)
-	  -w width - Hexdump with <width> (default 32)
+	Options:
+	 -c blocks   show <blocks> (default 1 block of 1024 bytes)
+	 -w width    Hexdump with <width> (default 32)
 	
 	EOF
 }
+
+version() {
+  local version=$(awk -F: '/^# Version / {sub(/ /,"",$NF) ; print $NF}' $0)
+  local author=$(awk -F: '/^# Author / {sub(/ /,"",$NF) ; print $NF}' $0)
+  local license=$(awk -F: '/^# License / {sub(/ /,"",$NF) ; print $NF}' $0)
+  case $license in
+    GPLv3+) local ltext="License GPLv3+: GNU GPL version 3 or later <http://gnu.org/licenses/gpl.html>." ;;
+    *)      local ltext="license $license (unknown)"
+  esac
+  cat <<- EOF
+	$(basename $0) ${version:-0.0}
+	Written by ${author:-<No Author>}, ${ltext}
+	@br
+	If you have suggestions for improvements in this tool, please send them along via the above address.
+	
+	Copyright (c) 2018 ${author% <*}
+	EOF
+  echo @br
+  echo This is free software: you are free to change and redistribute it.  There is NO WARRANTY, to the extent permitted by law.
+}
+
+mandump() {
+  test -x /usr/bin/help2man || exit 10
+  local desc=$(awk -F: '/^# Description/ {sub(/ /,"",$NF) ; print $NF; exit}' $0)
+  local sect=$(awk -F: '/^# Section/     {sub(/ /,"",$NF) ; print $NF; exit}' $0)
+  local manual=$(awk -F: '/^# Manual/    {sub(/ /,"",$NF) ; print $NF; exit}' $0)
+  local source=$(awk -F: '/^# Source/    {sub(/ /,"",$NF) ; print $NF; exit}' $0)
+  SOURCE_DATE_EPOCH=$(stat -c %Y $0); export SOURCE_DATE_EPOCH
+  help2man -N -n "$desc" -s "${sect:-1}" -S "${source:-Outrun}" -m "${manual:-Outrun manual}" $0 | sed "s/^@/\./"
+}
+
+case $1 in
+  -\?)       man $(basename $0) ; exit;;
+  --help)    usage   ; exit ;;
+  --version) version ; exit ;;
+  --mandump) mandump ; exit ;;
+esac
+
 #============================================================================
 # Functions
 # ---------------------------------------------------------------------------
@@ -55,7 +96,6 @@ while getopts ":hb:c:w:" OPT; do
       b) blksz=${OPTARG} ;;
       c) count=${OPTARG} ;;
       w) width=${OPTARG} ;;
-   \?|h) usage ; exit 0 ;;
   esac
 done
 shift $(expr $OPTIND - 1)
diff --git a/src/bin/wipedisk b/src/bin/wipedisk
index 9c40e35..a11dbf1 100755
--- a/src/bin/wipedisk
+++ b/src/bin/wipedisk
@@ -1,9 +1,11 @@
 #!/bin/bash
 #============================================================================
-# Title              : wipedisk
-# Description        : Wipes first 1MB of a disk and makes backup in /tmp
-# Author             : Bart Sjerps <bart@outrun.nl>
-# License            : GPLv3+
+# Title       : wipedisk
+# Description : Wipes first 1MB of a disk and makes backup in /tmp
+# Author      : Bart Sjerps <bart@outrun.nl>
+# Version     : 1.0
+# Manual      : asmdisks
+# License     : GPLv3+
 # ---------------------------------------------------------------------------
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -28,23 +30,89 @@
 # Configuration parameters:
 # ---------------------------------------------------------------------------
 
-#============================================================================
-# Initialization - Logging - Etc.
-# ---------------------------------------------------------------------------
-DATE=$(date +'%Y-%m-%d') # $(date +"%F-%H:%M:%S")
 #============================================================================
 # Usage:
 # ---------------------------------------------------------------------------
 usage() {
   cat <<- EOF
-	$(basename $0) -f [-n] <device>
-	Zeroes out the first 1 MiB of the give device (to clear all kinds of disk signatures).
+	Usage: $(basename $0) -f [-n] <device>
+	
+	Zeroes out the first 1 MiB of the given device (to clear all kinds of disk signatures)
+	and makes a backup copy to /tmp.
 	The "-f" option is required as a safeguard.
-	-n - nowait (skips 5 seconds safety delay)
+	
+	It uses
+	@B dd(1)
+	to dump a copy of the first 1 MiB to /tmp/
+	then
+	@B dd(1)
+	again to zero out the first part of the device.
+	This helps for reinstalling Linux (after 'wipedisk /dev/sda') or clearing ASM devices.
+	Note that only the header gets deleted, the rest of the original data is still on the disk.
+	You may restore accidentally wiped disks by dd'ing the 1st MB back from tmp, i.e.:
+	dd if=/tmp/backup__dev_<dev> of=/dev/<dev> bs=1M count=1
+	
+	Options:
+	 -n   nowait (skips 5 seconds safety delay)
+	 -f   force
+	
+	*Warning*
+	Needless to say that this command can be very dangerous!
+	Therefore the -f option is required and a backup of the deleted disk chunk is
+	stored in /tmp.  But a fool with a tool...
+	
+	*Example*
+	wipedisk /dev/sda
+	
+	Wipes the disk label of the bootdisk (dangerous!). 
+	Note that the example is broken. You need to add the "-f" to make it work.
+
+	*See also*
+	asm(1), dd(1)
+
+	*Info*
 	In case of emergency you can restore this first megabyte from backup in /tmp.
-	Run the manpage for mor info (man $(basename $0))
+	
 	EOF
 }
+
+version() {
+  local version=$(awk -F: '/^# Version / {sub(/ /,"",$NF) ; print $NF}' $0)
+  local author=$(awk -F: '/^# Author / {sub(/ /,"",$NF) ; print $NF}' $0)
+  local license=$(awk -F: '/^# License / {sub(/ /,"",$NF) ; print $NF}' $0)
+  case $license in
+    GPLv3+) local ltext="License GPLv3+: GNU GPL version 3 or later <http://gnu.org/licenses/gpl.html>." ;;
+    *)      local ltext="license $license (unknown)"
+  esac
+  cat <<- EOF
+	$(basename $0) ${version:-0.0}
+	Written by ${author:-<No Author>}, ${ltext}
+	@br
+	If you have suggestions for improvements in this tool, please send them along via the above address.
+	
+	Copyright (c) 2018 ${author% <*}
+	EOF
+  echo @br
+  echo This is free software: you are free to change and redistribute it.  There is NO WARRANTY, to the extent permitted by law.
+}
+
+mandump() {
+  test -x /usr/bin/help2man || exit 10
+  local desc=$(awk -F: '/^# Description/ {sub(/ /,"",$NF) ; print $NF; exit}' $0)
+  local sect=$(awk -F: '/^# Section/     {sub(/ /,"",$NF) ; print $NF; exit}' $0)
+  local manual=$(awk -F: '/^# Manual/    {sub(/ /,"",$NF) ; print $NF; exit}' $0)
+  local source=$(awk -F: '/^# Source/    {sub(/ /,"",$NF) ; print $NF; exit}' $0)
+  SOURCE_DATE_EPOCH=$(stat -c %Y $0); export SOURCE_DATE_EPOCH
+  help2man -N -n "$desc" -s "${sect:-1}" -S "${source:-Outrun}" -m "${manual:-Outrun manual}" $0 | sed "s/^@/\./"
+}
+
+case $1 in
+  -\?)       man $(basename $0) ; exit;;
+  --help)    usage   ; exit ;;
+  --version) version ; exit ;;
+  --mandump) mandump ; exit ;;
+esac
+
 #============================================================================
 # Functions
 # ---------------------------------------------------------------------------
@@ -55,8 +123,6 @@ while getopts ":hfn" OPT; do
   case "$OPT" in
     f)  FORCE=Y ;;
     n)  NOWAIT=Y ;;
-    h)	usage >&2 ; exit 1 ;;
-   \?)	usage >&2 ; exit 1 ;;
   esac
 done
 shift $(expr $OPTIND - 1)
diff --git a/src/build/manpage.bash b/src/build/manpage.bash
new file mode 100755
index 0000000..e7ef433
--- /dev/null
+++ b/src/build/manpage.bash
@@ -0,0 +1,55 @@
+#============================================================================
+# Title       : manpage.bash
+# Description : Functions to generate manpages in shell scripts
+# Version     : 1.0
+# Author      : Bart Sjerps <bart@outrun.nl>
+# Section     : 1
+# License     : GPLv3+
+#============================================================================
+# How to use:
+# Define: Title, Description, Version, Author and License as above
+# Optional: Section, Manual, Source
+# Then define usage function - see help2man(1) for formatting
+# Then add this line
+# source /usr/outrun/lib/manpage.bash || die "manpage extension not found"
+#
+# The date listed in the manpage is retrieved from the mtime of the file itself
+# ---------------------------------------------------------------------------
+
+version() {
+  local version=$(awk -F: '/^# Version / {sub(/ /,"",$NF) ; print $NF}' $0)
+  local author=$(awk -F: '/^# Author / {sub(/ /,"",$NF) ; print $NF}' $0)
+  local license=$(awk -F: '/^# License / {sub(/ /,"",$NF) ; print $NF}' $0)
+  case $license in
+    GPLv3+) local ltext="License GPLv3+: GNU GPL version 3 or later <http://gnu.org/licenses/gpl.html>." ;;
+    *)      local ltext="license $license (unknown)"
+  esac
+  cat <<- EOF
+	$(basename $0) ${version:-0.0}
+	Written by ${author:-<No Author>}, ${ltext}
+	@br
+	If you have suggestions for improvements in this tool, please send them along via the above address.
+	
+	Copyright (c) 2018 ${author% <*}
+	EOF
+  echo @br
+  echo This is free software: you are free to change and redistribute it.  There is NO WARRANTY, to the extent permitted by law.
+}
+
+mandump() {
+  test -x /usr/bin/help2man || exit 10
+  local desc=$(awk -F: '/^# Description/ {sub(/ /,"",$NF) ; print $NF; exit}' $0)
+  local sect=$(awk -F: '/^# Section/     {sub(/ /,"",$NF) ; print $NF; exit}' $0)
+  local manual=$(awk -F: '/^# Manual/    {sub(/ /,"",$NF) ; print $NF; exit}' $0)
+  local source=$(awk -F: '/^# Source/    {sub(/ /,"",$NF) ; print $NF; exit}' $0)
+  SOURCE_DATE_EPOCH=$(stat -c %Y $0); export SOURCE_DATE_EPOCH
+  help2man -N -n "$desc" -s "${sect:-1}" -S "${source:-Outrun}" -m "${manual:-Outrun manual}" $0 | sed "s/^@/\./"
+}
+
+case $1 in
+  -\?)       man $(basename $0) ; exit;;
+  --help)    usage   ; exit ;;
+  --version) version ; exit ;;
+  --mandump) mandump ; exit ;;
+esac
+
diff --git a/src/bin/asm.bash b/src/files/etc/bash_completion.d/asm.bash
similarity index 89%
rename from src/bin/asm.bash
rename to src/files/etc/bash_completion.d/asm.bash
index 6bd480d..a85eefa 100644
--- a/src/bin/asm.bash
+++ b/src/files/etc/bash_completion.d/asm.bash
@@ -1,8 +1,8 @@
 #============================================================================
-# Title              : asm.bash
-# Description        : bash_completion file for asm script
-# Author             : Bart Sjerps <bart@outrun.nl>
-# License            : GPLv3+
+# Title       : asm.bash
+# Description : bash_completion file for asm script
+# Author      : Bart Sjerps <bart@outrun.nl>
+# License     : GPLv3+
 # ---------------------------------------------------------------------------
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -16,6 +16,7 @@
 # more details.
 # ---------------------------------------------------------------------------
 # Revision history:
+# 2018-09-21 : Removed DSSD support, added scaleio
 # 2016-10-20 : Added DSSD support
 # 2015-03-10 : Updated for Powerpath support
 # 2014-11-06 : Updated for new asm options
@@ -26,7 +27,7 @@ _asm() {
   lsvols() { awk '$1!="#" && NF==3 {print $1}' /etc/asmtab 2>/dev/null ; }
   lsdevs() {
     find /dev/mapper -type l 2>/dev/null
-    find /dev -maxdepth 1 -type b -name "sd[b-z]" -o -name "sd[a-z][a-z]" -o -name "emcpower*" -o -name "dssd[0-9][0-9][0-9][0-9]"
+    find /dev -maxdepth 1 -type b -name "sd[b-z]" -o -name "sd[a-z][a-z]" -o -name "emcpower*" -o -name "scini*"
   }
   COMPREPLY=()
   cur="${COMP_WORDS[COMP_CWORD]}"