<?xml version="1.0" encoding="UTF-8"?>
<commit>
  <added type="array"/>
  <modified type="array">
    <modified>
      <diff>@@ -56,7 +56,7 @@ tested with two of the most popular services - StompServer and ActiveMQ.
 
 + StompServer
 
-	http://rubyforge.org/projects/stompserver/
+    http://rubyforge.org/projects/stompserver/
 
 StompServer is a lightweight queueing service written in Ruby which is
 suitable for testing or low volume puppet usage. Works well when both
@@ -67,7 +67,7 @@ Just install the stompserver gem and run 'stompserver'.
 
 + Apache ActiveMQ
 
-	http://activemq.apache.org
+    http://activemq.apache.org
 
 Considered by many to be the most popular message service in use today,
 ActiveMQ has hundreds of features for scaling, persistence and so on.
@@ -76,7 +76,7 @@ Although installation is fairly simple, the configuration can seem quite
 intimidating, but for our use a one line change to the  standard configuration
 is all that is required and is explained at:
 
-	http://activemq.apache.org/stomp.html
+    http://activemq.apache.org/stomp.html
 
 Other customization of the internal workings of ActiveMQ, if any, will depend
 on your needs and deployment. A quick skimming of the ActiveMQ documentation</diff>
      <filename>README.queueing</filename>
    </modified>
    <modified>
      <diff>@@ -16,30 +16,30 @@ Autotest.add_hook :initialize do |at|
 
     # force a complete re-run for all of these:
 
-	# main puppet lib
-	at.add_mapping(%r!^lib/puppet\.rb$!) { |filename, _|
+    # main puppet lib
+    at.add_mapping(%r!^lib/puppet\.rb$!) { |filename, _|
         at.files_matching %r!spec/(unit|integration)/.*\.rb!
-	}
+    }
 
-	# the spec_helper
-	at.add_mapping(%r!^spec/spec_helper\.rb$!) { |filename, _|
+    # the spec_helper
+    at.add_mapping(%r!^spec/spec_helper\.rb$!) { |filename, _|
         at.files_matching %r!spec/(unit|integration)/.*\.rb!
-	}
+    }
 
-	# the puppet test libraries
-	at.add_mapping(%r!^test/lib/puppettest/.*!) { |filename, _|
+    # the puppet test libraries
+    at.add_mapping(%r!^test/lib/puppettest/.*!) { |filename, _|
         at.files_matching %r!spec/(unit|integration)/.*\.rb!
-	}
+    }
 
         # the puppet spec libraries
-	at.add_mapping(%r!^spec/lib/spec.*!) { |filename, _|
+    at.add_mapping(%r!^spec/lib/spec.*!) { |filename, _|
         at.files_matching %r!spec/(unit|integration)/.*\.rb!
-	}
+    }
 
         # the monkey patches for rspec
-	at.add_mapping(%r!^spec/lib/monkey_patches/.*!) { |filename, _|
+    at.add_mapping(%r!^spec/lib/monkey_patches/.*!) { |filename, _|
         at.files_matching %r!spec/(unit|integration)/.*\.rb!
-	}
+    }
 end
 
 # a place for overrides when necessary.</diff>
      <filename>autotest/puppet_rspec.rb</filename>
    </modified>
    <modified>
      <diff>@@ -3,49 +3,49 @@
 # Distributed under the terms of the GNU General Public License v2
 
 depend() {
-	need net
-	before puppet
-	use dns logger
+    need net
+    before puppet
+    use dns logger
 }
 
 checkconfig() {
-	if [[ ! -d &quot;${PUPPETMASTER_PID_DIR}&quot; ]] ; then
-		eerror &quot;Please make sure PUPPETMASTER_PID_DIR is defined and points to a existing directory&quot;
-		return 1
-	fi
+    if [[ ! -d &quot;${PUPPETMASTER_PID_DIR}&quot; ]] ; then
+        eerror &quot;Please make sure PUPPETMASTER_PID_DIR is defined and points to a existing directory&quot;
+        return 1
+    fi
 
-	local site_manifest=&quot;/etc/puppet/manifests/site.pp&quot;
-	[[ -n &quot;${PUPPETMASTER_MANIFEST}&quot; ]] &amp;&amp; site_manifest=&quot;${PUPPETMASTER_MANIFEST}&quot;
+    local site_manifest=&quot;/etc/puppet/manifests/site.pp&quot;
+    [[ -n &quot;${PUPPETMASTER_MANIFEST}&quot; ]] &amp;&amp; site_manifest=&quot;${PUPPETMASTER_MANIFEST}&quot;
 
-	if [ ! -f &quot;${site_manifest}&quot; ] ; then
-		eerror &quot;Please create ${site_manifest} before running puppet&quot;
-		return 1
-	fi
+    if [ ! -f &quot;${site_manifest}&quot; ] ; then
+        eerror &quot;Please create ${site_manifest} before running puppet&quot;
+        return 1
+    fi
 
-	return 0
+    return 0
 }
 
 start() {
-	checkconfig || return $?
+    checkconfig || return $?
 
-	local options=&quot;&quot;
-	[[ -n &quot;${PUPPETMASTER_MANIFEST}&quot; ]]   &amp;&amp; options=&quot;${options} --manifest=${PUPPETMASTER_MANIFEST}&quot;
-	[[ -n &quot;${PUPPETMASTER_LOG}&quot; ]]        &amp;&amp; options=&quot;${options} --logdest=${PUPPETMASTER_LOG}&quot;
-	[[ -n &quot;${PUPPETMASTER_EXTRA_OPTS}&quot; ]] &amp;&amp; options=&quot;${options} ${PUPPETMASTER_EXTRA_OPTS}&quot;
+    local options=&quot;&quot;
+    [[ -n &quot;${PUPPETMASTER_MANIFEST}&quot; ]]   &amp;&amp; options=&quot;${options} --manifest=${PUPPETMASTER_MANIFEST}&quot;
+    [[ -n &quot;${PUPPETMASTER_LOG}&quot; ]]        &amp;&amp; options=&quot;${options} --logdest=${PUPPETMASTER_LOG}&quot;
+    [[ -n &quot;${PUPPETMASTER_EXTRA_OPTS}&quot; ]] &amp;&amp; options=&quot;${options} ${PUPPETMASTER_EXTRA_OPTS}&quot;
 
-	ebegin &quot;Starting puppetmaster&quot;
-	start-stop-daemon --start --quiet --exec /usr/bin/ruby /usr/bin/puppetmasterd \
-		-- ${options}
-	eend $? &quot;Failed to start puppetmaster&quot;
+    ebegin &quot;Starting puppetmaster&quot;
+    start-stop-daemon --start --quiet --exec /usr/bin/ruby /usr/bin/puppetmasterd \
+        -- ${options}
+    eend $? &quot;Failed to start puppetmaster&quot;
 }
 
 stop() {
-	ebegin &quot;Stopping puppetmaster&quot;
-	start-stop-daemon --stop --quiet \
-		--pidfile ${PUPPETMASTER_PID_DIR}/puppetmasterd.pid
-	local ret=$?
-	eend ${ret} &quot;Failed to stop puppetmaster&quot;
-	rm -f ${PUPPETMASTER_PID_DIR}/puppetmasterd.pid
-	return ${ret}
+    ebegin &quot;Stopping puppetmaster&quot;
+    start-stop-daemon --stop --quiet \
+        --pidfile ${PUPPETMASTER_PID_DIR}/puppetmasterd.pid
+    local ret=$?
+    eend ${ret} &quot;Failed to stop puppetmaster&quot;
+    rm -f ${PUPPETMASTER_PID_DIR}/puppetmasterd.pid
+    return ${ret}
 }
 </diff>
      <filename>conf/gentoo/init.d/puppetmaster</filename>
    </modified>
    <modified>
      <diff>@@ -2,35 +2,35 @@
 &lt;!DOCTYPE plist PUBLIC &quot;-//Apple//DTD PLIST 1.0//EN&quot; &quot;http://www.apple.com/DTDs/PropertyList-1.0.dtd&quot;&gt;
 &lt;plist version=&quot;1.0&quot;&gt;
 &lt;dict&gt;
-	&lt;key&gt;CFBundleIdentifier&lt;/key&gt;
-	&lt;string&gt;com.reductivelabs.puppet&lt;/string&gt;
-	&lt;key&gt;CFBundleShortVersionString&lt;/key&gt;
-	&lt;string&gt;{SHORTVERSION}&lt;/string&gt;
-	&lt;key&gt;IFMajorVersion&lt;/key&gt;
-	&lt;integer&gt;{MAJORVERSION}&lt;/integer&gt;
-	&lt;key&gt;IFMinorVersion&lt;/key&gt;
-	&lt;integer&gt;{MINORVERSION}&lt;/integer&gt;
-	&lt;key&gt;IFPkgFlagAllowBackRev&lt;/key&gt;
-	&lt;false/&gt;
-	&lt;key&gt;IFPkgFlagAuthorizationAction&lt;/key&gt;
-	&lt;string&gt;RootAuthorization&lt;/string&gt;
-	&lt;key&gt;IFPkgFlagDefaultLocation&lt;/key&gt;
-	&lt;string&gt;/&lt;/string&gt;
-	&lt;key&gt;IFPkgFlagFollowLinks&lt;/key&gt;
-	&lt;true/&gt;
-	&lt;key&gt;IFPkgFlagInstallFat&lt;/key&gt;
-	&lt;false/&gt;
-	&lt;key&gt;IFPkgFlagIsRequired&lt;/key&gt;
-	&lt;false/&gt;
-	&lt;key&gt;IFPkgFlagOverwritePermissions&lt;/key&gt;
-	&lt;false/&gt;
-	&lt;key&gt;IFPkgFlagRelocatable&lt;/key&gt;
-	&lt;false/&gt;
-	&lt;key&gt;IFPkgFlagRestartAction&lt;/key&gt;
-	&lt;string&gt;None&lt;/string&gt;
-	&lt;key&gt;IFPkgFlagRootVolumeOnly&lt;/key&gt;
-	&lt;true/&gt;
-	&lt;key&gt;IFPkgFlagUpdateInstalledLanguages&lt;/key&gt;
-	&lt;false/&gt;
+    &lt;key&gt;CFBundleIdentifier&lt;/key&gt;
+    &lt;string&gt;com.reductivelabs.puppet&lt;/string&gt;
+    &lt;key&gt;CFBundleShortVersionString&lt;/key&gt;
+    &lt;string&gt;{SHORTVERSION}&lt;/string&gt;
+    &lt;key&gt;IFMajorVersion&lt;/key&gt;
+    &lt;integer&gt;{MAJORVERSION}&lt;/integer&gt;
+    &lt;key&gt;IFMinorVersion&lt;/key&gt;
+    &lt;integer&gt;{MINORVERSION}&lt;/integer&gt;
+    &lt;key&gt;IFPkgFlagAllowBackRev&lt;/key&gt;
+    &lt;false/&gt;
+    &lt;key&gt;IFPkgFlagAuthorizationAction&lt;/key&gt;
+    &lt;string&gt;RootAuthorization&lt;/string&gt;
+    &lt;key&gt;IFPkgFlagDefaultLocation&lt;/key&gt;
+    &lt;string&gt;/&lt;/string&gt;
+    &lt;key&gt;IFPkgFlagFollowLinks&lt;/key&gt;
+    &lt;true/&gt;
+    &lt;key&gt;IFPkgFlagInstallFat&lt;/key&gt;
+    &lt;false/&gt;
+    &lt;key&gt;IFPkgFlagIsRequired&lt;/key&gt;
+    &lt;false/&gt;
+    &lt;key&gt;IFPkgFlagOverwritePermissions&lt;/key&gt;
+    &lt;false/&gt;
+    &lt;key&gt;IFPkgFlagRelocatable&lt;/key&gt;
+    &lt;false/&gt;
+    &lt;key&gt;IFPkgFlagRestartAction&lt;/key&gt;
+    &lt;string&gt;None&lt;/string&gt;
+    &lt;key&gt;IFPkgFlagRootVolumeOnly&lt;/key&gt;
+    &lt;true/&gt;
+    &lt;key&gt;IFPkgFlagUpdateInstalledLanguages&lt;/key&gt;
+    &lt;false/&gt;
 &lt;/dict&gt;
 &lt;/plist&gt;</diff>
      <filename>conf/osx/PackageInfo.plist</filename>
    </modified>
    <modified>
      <diff>@@ -33,28 +33,28 @@ PUPPET_OPTS=&quot;&quot;
 ##[ -n &quot;$INIT_VERSION&quot; ] &amp;&amp; PUPPET_OPTS=&quot;${PUPPET_OPTS} --fullrun&quot;
 
 start() {
-	echo -n $&quot;Starting puppet: &quot;
-        daemon $puppetd ${PUPPET_OPTS} ${PUPPET_EXTRA_OPTS}
-	RETVAL=$?
-	echo
+    echo -n $&quot;Starting puppet: &quot;
+    daemon $puppetd ${PUPPET_OPTS} ${PUPPET_EXTRA_OPTS}
+    RETVAL=$?
+    echo
         [ $RETVAL = 0 ] &amp;&amp; touch ${lockfile}
         return $RETVAL
 }
 
 stop() {
-	echo -n $&quot;Stopping puppet: &quot;
-        killproc $puppetd
-	RETVAL=$?
-	echo
-	[ $RETVAL = 0 ] &amp;&amp; rm -f ${lockfile} ${pidfile}
+    echo -n $&quot;Stopping puppet: &quot;
+    killproc $puppetd
+    RETVAL=$?
+    echo
+    [ $RETVAL = 0 ] &amp;&amp; rm -f ${lockfile} ${pidfile}
 }
 
 reload() {
-	echo -n $&quot;Restarting puppet: &quot;
-        killproc $puppetd -HUP
-	RETVAL=$?
-	echo
-	return $RETVAL
+    echo -n $&quot;Restarting puppet: &quot;
+    killproc $puppetd -HUP
+    RETVAL=$?
+    echo
+    return $RETVAL
 }
 
 restart() {
@@ -63,40 +63,40 @@ restart() {
 }
 
 genconfig() {
-  echo -n $&quot;Generate configuration puppet: &quot;
-  $puppetd ${PUPPET_OPTS} ${PUPPET_EXTRA_OPTS} --genconfig
+    echo -n $&quot;Generate configuration puppet: &quot;
+    $puppetd ${PUPPET_OPTS} ${PUPPET_EXTRA_OPTS} --genconfig
 }
 
 case &quot;$1&quot; in
-  start)
-	start
-	;;
-  stop) 
-	stop
-	;;
-  restart)
-	restart
-	;;
-  reload|force-reload)
+    start)
+        start
+    ;;
+    stop)
+        stop
+    ;;
+    restart)
+        restart
+    ;;
+    reload|force-reload)
         reload
-	;;
-  condrestart|try-restart)
-	[ -f &quot;$pidfile&quot; ] &amp;&amp; restart
-	;;
-  status)
+    ;;
+    condrestart|try-restart)
+        [ -f &quot;$pidfile&quot; ] &amp;&amp; restart
+    ;;
+    status)
         status -p &quot;$pidfile&quot; $puppetd
         RETVAL=$?
-	;;
-  once)
+    ;;
+    once)
         shift
         $puppetd -o ${PUPPET_OPTS} ${PUPPET_EXTRA_OPTS} $@
         ;;
-  genconfig)
-	genconfig
-	;;
-  *)
-	echo $&quot;Usage: $0 {start|stop|status|restart|reload|force-reload|condrestart|once|genconfig}&quot;
-	exit 1
+    genconfig)
+        genconfig
+    ;;
+    *)
+        echo $&quot;Usage: $0 {start|stop|status|restart|reload|force-reload|condrestart|once|genconfig}&quot;
+        exit 1
 esac
 
 exit $RETVAL</diff>
      <filename>conf/redhat/client.init</filename>
    </modified>
    <modified>
      <diff>@@ -18,7 +18,7 @@ lockfile=/var/lock/subsys/puppetmaster
 . /etc/rc.d/init.d/functions
 
 if [ -f /etc/sysconfig/puppetmaster ]; then
-	. /etc/sysconfig/puppetmaster
+    . /etc/sysconfig/puppetmaster
 fi
 
 PUPPETMASTER_OPTS=&quot;&quot;
@@ -30,7 +30,7 @@ elif [ -n &quot;$PUPPETMASTER_PORTS&quot; ] &amp;&amp; [ ${#PUPPETMASTER_PORTS[@]} -eq 1 ]; then
 fi
 [ -n &quot;$PUPPETMASTER_LOG&quot; ] &amp;&amp; PUPPETMASTER_OPTS=&quot;${PUPPETMASTER_OPTS} --logdest=${PUPPETMASTER_LOG}&quot;
 PUPPETMASTER_OPTS=&quot;${PUPPETMASTER_OPTS} \
-	${PUPPETMASTER_EXTRA_OPTS}&quot;
+    ${PUPPETMASTER_EXTRA_OPTS}&quot;
 
 RETVAL=0
 
@@ -38,10 +38,10 @@ prog=puppetmasterd
 PUPPETMASTER=/usr/sbin/$prog
 
 start() {
-	echo -n $&quot;Starting puppetmaster: &quot;
+    echo -n $&quot;Starting puppetmaster: &quot;
 
-	# Confirm the manifest exists
-	if [ -r $PUPPETMASTER_MANIFEST ]; then
+    # Confirm the manifest exists
+    if [ -r $PUPPETMASTER_MANIFEST ]; then
         if [ -n &quot;$PUPPETMASTER_PORTS&quot; ] &amp;&amp; [ ${#PUPPETMASTER_PORTS[@]} -gt 1 ]; then
             for ((i=0; i&lt;${#PUPPETMASTER_PORTS[@]}; i++)); do
                 echo -en &quot;\nPort: ${PUPPETMASTER_PORTS[$i]}&quot;
@@ -52,18 +52,18 @@ start() {
             daemon $PUPPETMASTER $PUPPETMASTER_OPTS
             RETVAL=$?
         fi
-	else
-		failure $&quot;Manifest does not exist: $PUPPETMASTER_MANIFEST&quot;
-		echo
-		return 1
-	fi
-	[ $RETVAL -eq 0 ] &amp;&amp; touch &quot;$lockfile&quot;
-	echo
-	return $RETVAL
+    else
+        failure $&quot;Manifest does not exist: $PUPPETMASTER_MANIFEST&quot;
+        echo
+        return 1
+    fi
+    [ $RETVAL -eq 0 ] &amp;&amp; touch &quot;$lockfile&quot;
+    echo
+    return $RETVAL
 }
 
 stop() {
-	echo -n  $&quot;Stopping puppetmaster: &quot;
+    echo -n  $&quot;Stopping puppetmaster: &quot;
     if [ -n &quot;$PUPPETMASTER_PORTS&quot; ] &amp;&amp; [ ${#PUPPETMASTER_PORTS[@]} -gt 1 ]; then
         for ((i=0; i&lt;${#PUPPETMASTER_PORTS[@]}; i++)); do
             echo -en &quot;\nPort: ${PUPPETMASTER_PORTS[$i]}&quot;
@@ -74,9 +74,9 @@ stop() {
        killproc $PUPPETMASTER
        RETVAL=$?
     fi
-	echo
-	[ $RETVAL -eq 0 ] &amp;&amp; rm -f &quot;$lockfile&quot;
-	return $RETVAL
+    echo
+    [ $RETVAL -eq 0 ] &amp;&amp; rm -f &quot;$lockfile&quot;
+    return $RETVAL
 }
 
 restart() {
@@ -97,7 +97,7 @@ puppetmaster_status() {
             ret=$?; [ $ret != 0 ] &amp;&amp; RETVAL=$ret
         done 
     else
-	    status $PUPPETMASTER
+        status $PUPPETMASTER
         RETVAL=$?
     fi
     return $RETVAL
@@ -105,26 +105,26 @@ puppetmaster_status() {
 
 case &quot;$1&quot; in
   start)
-	start
-	;;
-  stop) 
-	stop
-	;;
-  restart|reload|force-reload)
+      start
+    ;;
+    stop)
+        stop
+    ;;
+    restart|reload|force-reload)
         restart
-	;;
-  condrestart)
-	[ -f &quot;$lockfile&quot; ] &amp;&amp; restart
-	;;
-  status)
-    puppetmaster_status
-	;;
-  genconfig)
-	genconfig
-	;;
-  *)
-	echo $&quot;Usage: $0 {start|stop|status|restart|reload|force-reload|condrestart|genconfig}&quot;
-	exit 1
+    ;;
+    condrestart)
+        [ -f &quot;$lockfile&quot; ] &amp;&amp; restart
+    ;;
+    status)
+        puppetmaster_status
+    ;;
+    genconfig)
+        genconfig
+    ;;
+    *)
+        echo $&quot;Usage: $0 {start|stop|status|restart|reload|force-reload|condrestart|genconfig}&quot;
+        exit 1
 esac
 
 exit $RETVAL</diff>
      <filename>conf/redhat/server.init</filename>
    </modified>
    <modified>
      <diff>@@ -7,71 +7,71 @@
 
 
 &lt;service
-	name='network/puppetd'
-	type='service'
-	version='1'&gt;
+    name='network/puppetd'
+    type='service'
+    version='1'&gt;
 
-        &lt;create_default_instance enabled='true'/&gt;
-        &lt;single_instance/&gt;
+    &lt;create_default_instance enabled='true'/&gt;
+    &lt;single_instance/&gt;
 
-        &lt;dependency name='config-file'
-                    grouping='require_all'
-                    restart_on='none'
-                    type='path'&gt;
-                &lt;service_fmri value='file:///etc/puppet/puppet.conf'/&gt;
-        &lt;/dependency&gt;
+    &lt;dependency name='config-file'
+                grouping='require_all'
+                restart_on='none'
+                type='path'&gt;
+        &lt;service_fmri value='file:///etc/puppet/puppet.conf'/&gt;
+    &lt;/dependency&gt;
         
-	&lt;dependency name='loopback'
-		    grouping='require_all'
-		    restart_on='error'
-		    type='service'&gt;
-		&lt;service_fmri value='svc:/network/loopback:default'/&gt;
-	&lt;/dependency&gt;
+    &lt;dependency name='loopback'
+                grouping='require_all'
+                restart_on='error'
+                type='service'&gt;
+        &lt;service_fmri value='svc:/network/loopback:default'/&gt;
+    &lt;/dependency&gt;
 
-	&lt;dependency name='physical'
-		    grouping='require_all'
-		    restart_on='error'
-		    type='service'&gt;
-		&lt;service_fmri value='svc:/network/physical:default'/&gt;
-	&lt;/dependency&gt;
+    &lt;dependency name='physical'
+                grouping='require_all'
+                restart_on='error'
+                type='service'&gt;
+        &lt;service_fmri value='svc:/network/physical:default'/&gt;
+    &lt;/dependency&gt;
 
-	&lt;dependency name='fs-local'
-		    grouping='require_all'
-		    restart_on='none'
-		    type='service'&gt;
-		&lt;service_fmri value='svc:/system/filesystem/local'/&gt;
-	&lt;/dependency&gt;
+    &lt;dependency name='fs-local'
+                grouping='require_all'
+                restart_on='none'
+                type='service'&gt;
+        &lt;service_fmri value='svc:/system/filesystem/local'/&gt;
+    &lt;/dependency&gt;
 
-	&lt;exec_method
-		type='method'
-		name='start'
+    &lt;exec_method
+        type='method'
+        name='start'
         exec='/opt/csw/lib/svc/method/svc-puppetd start'
-		timeout_seconds='60' /&gt;
+        timeout_seconds='60' /&gt;
 
-	&lt;exec_method
-		type='method'
-		name='stop'
+    &lt;exec_method
+        type='method'
+        name='stop'
         exec='/opt/csw/lib/svc/method/svc-puppetd stop'
-		timeout_seconds='60' /&gt;
+        timeout_seconds='60' /&gt;
 
-	&lt;exec_method
-		type='method'
-		name='refresh'
+    &lt;exec_method
+        type='method'
+        name='refresh'
         exec='/opt/csw/lib/svc/method/svc-puppetd reload'
-		timeout_seconds='60' /&gt;
+        timeout_seconds='60' /&gt;
 
-	&lt;stability value='Unstable' /&gt;
+    &lt;stability value='Unstable' /&gt;
 
-	&lt;template&gt;
-		&lt;common_name&gt;
-			&lt;loctext xml:lang='C'&gt;Puppet Client Daemon&lt;/loctext&gt;
-		&lt;/common_name&gt;
-		&lt;documentation&gt;
-			&lt;manpage title='puppetd' section='1' /&gt;
-			&lt;doc_link name='reductivelabs.com'
-				uri='http://www.reductivelabs.com/projects/puppet' /&gt;
-		&lt;/documentation&gt;
-	&lt;/template&gt;
+    &lt;template&gt;
+        &lt;common_name&gt;
+            &lt;loctext xml:lang='C'&gt;Puppet Client Daemon&lt;/loctext&gt;
+        &lt;/common_name&gt;
+        &lt;documentation&gt;
+            &lt;manpage title='puppetd' section='1' /&gt;
+            &lt;doc_link name='reductivelabs.com'
+                uri='http://www.reductivelabs.com/projects/puppet' /&gt;
+        &lt;/documentation&gt;
+    &lt;/template&gt;
 &lt;/service&gt;
 
 &lt;/service_bundle&gt;</diff>
      <filename>conf/solaris/smf/puppetd.xml</filename>
    </modified>
    <modified>
      <diff>@@ -7,71 +7,71 @@
 
 
 &lt;service
-	name='network/puppetmasterd'
-	type='service'
-	version='1'&gt;
+    name='network/puppetmasterd'
+    type='service'
+    version='1'&gt;
 
-        &lt;create_default_instance enabled='true'/&gt;
-        &lt;single_instance/&gt;
+    &lt;create_default_instance enabled='true'/&gt;
+    &lt;single_instance/&gt;
 
-        &lt;dependency name='config-file'
-                    grouping='require_all'
-                    restart_on='none'
-                    type='path'&gt;
-                &lt;service_fmri value='file:///etc/puppet/puppet.conf'/&gt;
-        &lt;/dependency&gt;
+    &lt;dependency name='config-file'
+                grouping='require_all'
+                restart_on='none'
+                type='path'&gt;
+        &lt;service_fmri value='file:///etc/puppet/puppet.conf'/&gt;
+    &lt;/dependency&gt;
         
-	&lt;dependency name='loopback'
-		    grouping='require_all'
-		    restart_on='error'
-		    type='service'&gt;
-		&lt;service_fmri value='svc:/network/loopback:default'/&gt;
-	&lt;/dependency&gt;
+    &lt;dependency name='loopback'
+                grouping='require_all'
+                restart_on='error'
+                type='service'&gt;
+        &lt;service_fmri value='svc:/network/loopback:default'/&gt;
+    &lt;/dependency&gt;
 
-	&lt;dependency name='physical'
-		    grouping='require_all'
-		    restart_on='error'
-		    type='service'&gt;
-		&lt;service_fmri value='svc:/network/physical:default'/&gt;
-	&lt;/dependency&gt;
+    &lt;dependency name='physical'
+                grouping='require_all'
+                restart_on='error'
+                type='service'&gt;
+        &lt;service_fmri value='svc:/network/physical:default'/&gt;
+    &lt;/dependency&gt;
 
-	&lt;dependency name='fs-local'
-		    grouping='require_all'
-		    restart_on='none'
-		    type='service'&gt;
-		&lt;service_fmri value='svc:/system/filesystem/local'/&gt;
-	&lt;/dependency&gt;
+    &lt;dependency name='fs-local'
+                grouping='require_all'
+                restart_on='none'
+                type='service'&gt;
+        &lt;service_fmri value='svc:/system/filesystem/local'/&gt;
+    &lt;/dependency&gt;
 
-	&lt;exec_method
-		type='method'
-		name='start'
+    &lt;exec_method
+        type='method'
+        name='start'
         exec='/opt/csw/lib/svc/method/svc-puppetmasterd start'
-		timeout_seconds='60' /&gt;
+        timeout_seconds='60' /&gt;
 
-	&lt;exec_method
-		type='method'
-		name='stop'
+    &lt;exec_method
+        type='method'
+        name='stop'
         exec='/opt/csw/lib/svc/method/svc-puppetmasterd stop'
-		timeout_seconds='60' /&gt;
+        timeout_seconds='60' /&gt;
 
-	&lt;exec_method
-		type='method'
-		name='refresh'
+    &lt;exec_method
+        type='method'
+        name='refresh'
         exec='/opt/csw/lib/svc/method/svc-puppetmasterd reload'
-		timeout_seconds='60' /&gt;
+        timeout_seconds='60' /&gt;
 
-	&lt;stability value='Unstable' /&gt;
+    &lt;stability value='Unstable' /&gt;
 
-	&lt;template&gt;
-		&lt;common_name&gt;
-			&lt;loctext xml:lang='C'&gt;Puppet Server Daemon&lt;/loctext&gt;
-		&lt;/common_name&gt;
-		&lt;documentation&gt;
-			&lt;manpage title='puppetmasterd' section='1' /&gt;
-			&lt;doc_link name='reductivelabs.com'
-				uri='http://www.reductivelabs.com/projects/puppet' /&gt;
-		&lt;/documentation&gt;
-	&lt;/template&gt;
+    &lt;template&gt;
+        &lt;common_name&gt;
+            &lt;loctext xml:lang='C'&gt;Puppet Server Daemon&lt;/loctext&gt;
+        &lt;/common_name&gt;
+        &lt;documentation&gt;
+            &lt;manpage title='puppetmasterd' section='1' /&gt;
+            &lt;doc_link name='reductivelabs.com'
+                uri='http://www.reductivelabs.com/projects/puppet' /&gt;
+        &lt;/documentation&gt;
+    &lt;/template&gt;
 &lt;/service&gt;
 
 &lt;/service_bundle&gt;</diff>
      <filename>conf/solaris/smf/puppetmasterd.xml</filename>
    </modified>
    <modified>
      <diff>@@ -45,8 +45,8 @@ reload)
 
     kill -HUP `cat $pidfile`
 
-	printf &quot; puppetd&quot;
-	echo &quot;&quot;
+    printf &quot; puppetd&quot;
+    echo &quot;&quot;
     ;;
 status)
     if [ -f $pidfile ]; then</diff>
      <filename>conf/solaris/smf/svc-puppetd</filename>
    </modified>
    <modified>
      <diff>@@ -41,8 +41,8 @@ reload)
 
     kill -HUP `cat $pidfile`
 
-	printf &quot; puppetmasterd&quot;
-	echo &quot;&quot;
+    printf &quot; puppetmasterd&quot;
+    echo &quot;&quot;
     ;;
 status)
     if [ -f $pidfile ]; then</diff>
      <filename>conf/solaris/smf/svc-puppetmasterd</filename>
    </modified>
    <modified>
      <diff>@@ -66,7 +66,7 @@ case &quot;$1&quot; in
 
         # startproc should return 0, even if service is
         # already running to match LSB spec.
-	startproc $puppetd ${PUPPET_OPTS} ${PUPPET_EXTRA_OPTS} &amp;&amp; touch ${lockfile}
+        startproc $puppetd ${PUPPET_OPTS} ${PUPPET_EXTRA_OPTS} &amp;&amp; touch ${lockfile}
         # Remember status and be verbose
         rc_status -v
         ;;
@@ -112,8 +112,8 @@ case &quot;$1&quot; in
         ## signalling, do nothing (!)
 
         # If it supports signalling:
-	echo -n &quot;Reload puppet services.&quot;
-	killproc -HUP  $puppetd
+        echo -n &quot;Reload puppet services.&quot;
+        killproc -HUP  $puppetd
         rc_status -v
         ;;
     status)</diff>
      <filename>conf/suse/client.init</filename>
    </modified>
    <modified>
      <diff>@@ -110,19 +110,19 @@ exit 0
 
 %preun
 if [ &quot;$1&quot; = 0 ] ; then
-	/sbin/service puppet stop &gt; /dev/null 2&gt;&amp;1
-	/sbin/chkconfig --del puppet
+    /sbin/service puppet stop &gt; /dev/null 2&gt;&amp;1
+    /sbin/chkconfig --del puppet
 fi
 
 %preun server
 if [ &quot;$1&quot; = 0 ] ; then
-	/sbin/service puppetmaster stop &gt; /dev/null 2&gt;&amp;1
-	/sbin/chkconfig --del puppetmaster
+    /sbin/service puppetmaster stop &gt; /dev/null 2&gt;&amp;1
+    /sbin/chkconfig --del puppetmaster
 fi
 
 %postun server
 if [ &quot;$1&quot; -ge 1 ]; then
-	 /sbin/service puppetmaster try-restart &gt; /dev/null 2&gt;&amp;1
+    /sbin/service puppetmaster try-restart &gt; /dev/null 2&gt;&amp;1
 fi
 
 %clean</diff>
      <filename>conf/suse/puppet.spec</filename>
    </modified>
    <modified>
      <diff>@@ -36,15 +36,15 @@ pidfile=/var/run/puppet/puppetmasterd.pid
 [ -f /etc/rc.status ] &amp;&amp; . /etc/rc.status
 
 if [ -f /etc/sysconfig/puppetmaster ]; then
-	. /etc/sysconfig/puppetmaster
+    . /etc/sysconfig/puppetmaster
 fi
 
 [ -z &quot;$PUPPETMASTER_MANIFEST&quot; ] &amp;&amp; PUPPETMASTER_MANIFEST=/etc/puppet/manifests/site.pp
 [ -z &quot;$PUPPETMASTER_LOG&quot; ] &amp;&amp; PUPPETMASTER_LOG=&quot;/var/log/puppet/puppetmaster.log&quot;
 PUPPETMASTER_OPTS=&quot;
-	--manifest=$PUPPETMASTER_MANIFEST \
-	--logdest=${PUPPETMASTER_LOG} \
-	${PUPPETMASTER_EXTRA_OPTS}&quot;
+    --manifest=$PUPPETMASTER_MANIFEST \
+    --logdest=${PUPPETMASTER_LOG} \
+    ${PUPPETMASTER_EXTRA_OPTS}&quot;
 PUPPET_OPTS=&quot;&quot;
 [ -n &quot;${PUPPET_SERVER}&quot; ] &amp;&amp; PUPPET_OPTS=&quot;--server=${PUPPET_SERVER}&quot;
 [ -n &quot;$PUPPET_LOG&quot; ] &amp;&amp; PUPPET_OPTS=&quot;${PUPPET_OPTS} --logdest=${PUPPET_LOG}&quot;
@@ -54,10 +54,10 @@ prog=puppetmasterd
 PUPPETMASTER=/usr/sbin/$prog
 
 start() {
-	echo -n $&quot;Starting puppetmaster: &quot;
+    echo -n $&quot;Starting puppetmaster: &quot;
 
-	echo
-	return $RETVAL
+    echo
+    return $RETVAL
 }
 # First reset status of this service
 rc_reset
@@ -84,13 +84,13 @@ case &quot;$1&quot; in
 
         # startproc should return 0, even if service is
         # already running to match LSB spec.
-	# Confirm the manifest exists
-	if [ -r $PUPPETMASTER_MANIFEST ]; then
-		startproc $PUPPETMASTER $PUPPETMASTER_OPTS &amp;&amp; touch &quot;$lockfile&quot;
-	else
-		rc_failed 
-		echo &quot;Manifest does not exist: $PUPPETMASTER_MANIFEST&quot;
-	fi
+        # Confirm the manifest exists
+        if [ -r $PUPPETMASTER_MANIFEST ]; then
+            startproc $PUPPETMASTER $PUPPETMASTER_OPTS &amp;&amp; touch &quot;$lockfile&quot;
+        else
+            rc_failed
+            echo &quot;Manifest does not exist: $PUPPETMASTER_MANIFEST&quot;
+        fi
         # Remember status and be verbose
         rc_status -v
         ;;
@@ -136,8 +136,8 @@ case &quot;$1&quot; in
         ## signalling, do nothing (!)
 
         # If it supports signalling:
-	echo -n &quot;Reload puppet services.&quot;
-	killproc -HUP  $PUPPETMASTER
+        echo -n &quot;Reload puppet services.&quot;
+        killproc -HUP  $PUPPETMASTER
         rc_status -v
         ;;
     status)</diff>
      <filename>conf/suse/server.init</filename>
    </modified>
    <modified>
      <diff>@@ -51,22 +51,22 @@ function status
 case &quot;$1&quot; in
     start)
         start
-	;;
+    ;;
     stop)
         stop
-	;;
+    ;;
     restart)
         stop; start
-	;;
+    ;;
     status)
         output=`status`
         #status
         exit $?
-	;;
-  *)
-	echo &quot;Usage: $N {start|stop|restart|force-reload}&quot; &gt;&amp;2
-	exit 1
-	;;
+    ;;
+    *)
+        echo &quot;Usage: $N {start|stop|restart|force-reload}&quot; &gt;&amp;2
+        exit 1
+    ;;
 esac
 
 exit 0</diff>
      <filename>examples/etc/init.d/sleeper</filename>
    </modified>
    <modified>
      <diff>@@ -4,114 +4,114 @@ mcx { '/Groups/mcx_dock':
 &lt;!DOCTYPE plist PUBLIC &quot;-//Apple//DTD PLIST 1.0//EN&quot; &quot;http://www.apple.com/DTDs/PropertyList-1.0.dtd&quot;&gt;
 &lt;plist version=&quot;1.0&quot;&gt;
 &lt;dict&gt;
-	&lt;key&gt;com.apple.dock&lt;/key&gt;
-	&lt;dict&gt;
-		&lt;key&gt;AppItems-Raw&lt;/key&gt;
-		&lt;dict&gt;
-			&lt;key&gt;state&lt;/key&gt;
-			&lt;string&gt;always&lt;/string&gt;
-			&lt;key&gt;upk&lt;/key&gt;
-			&lt;dict&gt;
-				&lt;key&gt;mcx_input_key_names&lt;/key&gt;
-				&lt;array&gt;
-					&lt;string&gt;AppItems-Raw&lt;/string&gt;
-				&lt;/array&gt;
-				&lt;key&gt;mcx_output_key_name&lt;/key&gt;
-				&lt;string&gt;static-apps&lt;/string&gt;
-				&lt;key&gt;mcx_remove_duplicates&lt;/key&gt;
-				&lt;true/&gt;
-			&lt;/dict&gt;
-			&lt;key&gt;value&lt;/key&gt;
-			&lt;array&gt;
-				&lt;dict&gt;
-					&lt;key&gt;mcx_typehint&lt;/key&gt;
-					&lt;integer&gt;1&lt;/integer&gt;
-					&lt;key&gt;tile-data&lt;/key&gt;
-					&lt;dict&gt;
-						&lt;key&gt;file-data&lt;/key&gt;
-						&lt;dict&gt;
-							&lt;key&gt;_CFURLString&lt;/key&gt;
-							&lt;string&gt;/Applications/Mail.app&lt;/string&gt;
-							&lt;key&gt;_CFURLStringType&lt;/key&gt;
-							&lt;integer&gt;0&lt;/integer&gt;
-						&lt;/dict&gt;
-						&lt;key&gt;file-label&lt;/key&gt;
-						&lt;string&gt;Mail&lt;/string&gt;
-					&lt;/dict&gt;
-					&lt;key&gt;tile-type&lt;/key&gt;
-					&lt;string&gt;file-tile&lt;/string&gt;
-				&lt;/dict&gt;
-				&lt;dict&gt;
-					&lt;key&gt;mcx_typehint&lt;/key&gt;
-					&lt;integer&gt;1&lt;/integer&gt;
-					&lt;key&gt;tile-data&lt;/key&gt;
-					&lt;dict&gt;
-						&lt;key&gt;file-data&lt;/key&gt;
-						&lt;dict&gt;
-							&lt;key&gt;_CFURLString&lt;/key&gt;
-							&lt;string&gt;/Applications/Safari.app&lt;/string&gt;
-							&lt;key&gt;_CFURLStringType&lt;/key&gt;
-							&lt;integer&gt;0&lt;/integer&gt;
-						&lt;/dict&gt;
-						&lt;key&gt;file-label&lt;/key&gt;
-						&lt;string&gt;Safari&lt;/string&gt;
-					&lt;/dict&gt;
-					&lt;key&gt;tile-type&lt;/key&gt;
-					&lt;string&gt;file-tile&lt;/string&gt;
-				&lt;/dict&gt;
-			&lt;/array&gt;
-		&lt;/dict&gt;
-		&lt;key&gt;DocItems-Raw&lt;/key&gt;
-		&lt;dict&gt;
-			&lt;key&gt;state&lt;/key&gt;
-			&lt;string&gt;always&lt;/string&gt;
-			&lt;key&gt;upk&lt;/key&gt;
-			&lt;dict&gt;
-				&lt;key&gt;mcx_input_key_names&lt;/key&gt;
-				&lt;array&gt;
-					&lt;string&gt;DocItems-Raw&lt;/string&gt;
-				&lt;/array&gt;
-				&lt;key&gt;mcx_output_key_name&lt;/key&gt;
-				&lt;string&gt;static-others&lt;/string&gt;
-				&lt;key&gt;mcx_remove_duplicates&lt;/key&gt;
-				&lt;true/&gt;
-			&lt;/dict&gt;
-			&lt;key&gt;value&lt;/key&gt;
-			&lt;array/&gt;
-		&lt;/dict&gt;
-		&lt;key&gt;MCXDockSpecialFolders-Raw&lt;/key&gt;
-		&lt;dict&gt;
-			&lt;key&gt;state&lt;/key&gt;
-			&lt;string&gt;always&lt;/string&gt;
-			&lt;key&gt;upk&lt;/key&gt;
-			&lt;dict&gt;
-				&lt;key&gt;mcx_input_key_names&lt;/key&gt;
-				&lt;array&gt;
-					&lt;string&gt;MCXDockSpecialFolders-Raw&lt;/string&gt;
-				&lt;/array&gt;
-				&lt;key&gt;mcx_output_key_name&lt;/key&gt;
-				&lt;string&gt;MCXDockSpecialFolders&lt;/string&gt;
-				&lt;key&gt;mcx_remove_duplicates&lt;/key&gt;
-				&lt;true/&gt;
-			&lt;/dict&gt;
-			&lt;key&gt;value&lt;/key&gt;
-			&lt;array/&gt;
-		&lt;/dict&gt;
-		&lt;key&gt;contents-immutable&lt;/key&gt;
-		&lt;dict&gt;
-			&lt;key&gt;state&lt;/key&gt;
-			&lt;string&gt;always&lt;/string&gt;
-			&lt;key&gt;value&lt;/key&gt;
-			&lt;false/&gt;
-		&lt;/dict&gt;
-		&lt;key&gt;static-only&lt;/key&gt;
-		&lt;dict&gt;
-			&lt;key&gt;state&lt;/key&gt;
-			&lt;string&gt;always&lt;/string&gt;
-			&lt;key&gt;value&lt;/key&gt;
-			&lt;false/&gt;
-		&lt;/dict&gt;
-	&lt;/dict&gt;
+    &lt;key&gt;com.apple.dock&lt;/key&gt;
+    &lt;dict&gt;
+        &lt;key&gt;AppItems-Raw&lt;/key&gt;
+        &lt;dict&gt;
+            &lt;key&gt;state&lt;/key&gt;
+            &lt;string&gt;always&lt;/string&gt;
+            &lt;key&gt;upk&lt;/key&gt;
+            &lt;dict&gt;
+                &lt;key&gt;mcx_input_key_names&lt;/key&gt;
+                &lt;array&gt;
+                    &lt;string&gt;AppItems-Raw&lt;/string&gt;
+                &lt;/array&gt;
+                &lt;key&gt;mcx_output_key_name&lt;/key&gt;
+                &lt;string&gt;static-apps&lt;/string&gt;
+                &lt;key&gt;mcx_remove_duplicates&lt;/key&gt;
+                &lt;true/&gt;
+            &lt;/dict&gt;
+            &lt;key&gt;value&lt;/key&gt;
+            &lt;array&gt;
+                &lt;dict&gt;
+                    &lt;key&gt;mcx_typehint&lt;/key&gt;
+                    &lt;integer&gt;1&lt;/integer&gt;
+                    &lt;key&gt;tile-data&lt;/key&gt;
+                    &lt;dict&gt;
+                        &lt;key&gt;file-data&lt;/key&gt;
+                        &lt;dict&gt;
+                            &lt;key&gt;_CFURLString&lt;/key&gt;
+                            &lt;string&gt;/Applications/Mail.app&lt;/string&gt;
+                            &lt;key&gt;_CFURLStringType&lt;/key&gt;
+                            &lt;integer&gt;0&lt;/integer&gt;
+                        &lt;/dict&gt;
+                        &lt;key&gt;file-label&lt;/key&gt;
+                        &lt;string&gt;Mail&lt;/string&gt;
+                    &lt;/dict&gt;
+                    &lt;key&gt;tile-type&lt;/key&gt;
+                    &lt;string&gt;file-tile&lt;/string&gt;
+                &lt;/dict&gt;
+                &lt;dict&gt;
+                    &lt;key&gt;mcx_typehint&lt;/key&gt;
+                    &lt;integer&gt;1&lt;/integer&gt;
+                    &lt;key&gt;tile-data&lt;/key&gt;
+                    &lt;dict&gt;
+                        &lt;key&gt;file-data&lt;/key&gt;
+                        &lt;dict&gt;
+                            &lt;key&gt;_CFURLString&lt;/key&gt;
+                            &lt;string&gt;/Applications/Safari.app&lt;/string&gt;
+                            &lt;key&gt;_CFURLStringType&lt;/key&gt;
+                            &lt;integer&gt;0&lt;/integer&gt;
+                        &lt;/dict&gt;
+                        &lt;key&gt;file-label&lt;/key&gt;
+                        &lt;string&gt;Safari&lt;/string&gt;
+                    &lt;/dict&gt;
+                    &lt;key&gt;tile-type&lt;/key&gt;
+                    &lt;string&gt;file-tile&lt;/string&gt;
+                &lt;/dict&gt;
+            &lt;/array&gt;
+        &lt;/dict&gt;
+        &lt;key&gt;DocItems-Raw&lt;/key&gt;
+        &lt;dict&gt;
+            &lt;key&gt;state&lt;/key&gt;
+            &lt;string&gt;always&lt;/string&gt;
+            &lt;key&gt;upk&lt;/key&gt;
+            &lt;dict&gt;
+                &lt;key&gt;mcx_input_key_names&lt;/key&gt;
+                &lt;array&gt;
+                    &lt;string&gt;DocItems-Raw&lt;/string&gt;
+                &lt;/array&gt;
+                &lt;key&gt;mcx_output_key_name&lt;/key&gt;
+                &lt;string&gt;static-others&lt;/string&gt;
+                &lt;key&gt;mcx_remove_duplicates&lt;/key&gt;
+                &lt;true/&gt;
+            &lt;/dict&gt;
+            &lt;key&gt;value&lt;/key&gt;
+            &lt;array/&gt;
+        &lt;/dict&gt;
+        &lt;key&gt;MCXDockSpecialFolders-Raw&lt;/key&gt;
+        &lt;dict&gt;
+            &lt;key&gt;state&lt;/key&gt;
+            &lt;string&gt;always&lt;/string&gt;
+            &lt;key&gt;upk&lt;/key&gt;
+            &lt;dict&gt;
+                &lt;key&gt;mcx_input_key_names&lt;/key&gt;
+                &lt;array&gt;
+                    &lt;string&gt;MCXDockSpecialFolders-Raw&lt;/string&gt;
+                &lt;/array&gt;
+                &lt;key&gt;mcx_output_key_name&lt;/key&gt;
+                &lt;string&gt;MCXDockSpecialFolders&lt;/string&gt;
+                &lt;key&gt;mcx_remove_duplicates&lt;/key&gt;
+                &lt;true/&gt;
+            &lt;/dict&gt;
+            &lt;key&gt;value&lt;/key&gt;
+            &lt;array/&gt;
+        &lt;/dict&gt;
+        &lt;key&gt;contents-immutable&lt;/key&gt;
+        &lt;dict&gt;
+            &lt;key&gt;state&lt;/key&gt;
+            &lt;string&gt;always&lt;/string&gt;
+            &lt;key&gt;value&lt;/key&gt;
+            &lt;false/&gt;
+        &lt;/dict&gt;
+        &lt;key&gt;static-only&lt;/key&gt;
+        &lt;dict&gt;
+            &lt;key&gt;state&lt;/key&gt;
+            &lt;string&gt;always&lt;/string&gt;
+            &lt;key&gt;value&lt;/key&gt;
+            &lt;false/&gt;
+        &lt;/dict&gt;
+    &lt;/dict&gt;
 &lt;/dict&gt;
 &lt;/plist&gt;
 '</diff>
      <filename>examples/mcx_dock_default.pp</filename>
    </modified>
    <modified>
      <diff>@@ -11,114 +11,114 @@ mcx {
 &lt;!DOCTYPE plist PUBLIC &quot;-//Apple//DTD PLIST 1.0//EN&quot; &quot;http://www.apple.com/DTDs/PropertyList-1.0.dtd&quot;&gt;
 &lt;plist version=&quot;1.0&quot;&gt;
 &lt;dict&gt;
-	&lt;key&gt;com.apple.dock&lt;/key&gt;
-	&lt;dict&gt;
-		&lt;key&gt;AppItems-Raw&lt;/key&gt;
-		&lt;dict&gt;
-			&lt;key&gt;state&lt;/key&gt;
-			&lt;string&gt;always&lt;/string&gt;
-			&lt;key&gt;upk&lt;/key&gt;
-			&lt;dict&gt;
-				&lt;key&gt;mcx_input_key_names&lt;/key&gt;
-				&lt;array&gt;
-					&lt;string&gt;AppItems-Raw&lt;/string&gt;
-				&lt;/array&gt;
-				&lt;key&gt;mcx_output_key_name&lt;/key&gt;
-				&lt;string&gt;static-apps&lt;/string&gt;
-				&lt;key&gt;mcx_remove_duplicates&lt;/key&gt;
-				&lt;true/&gt;
-			&lt;/dict&gt;
-			&lt;key&gt;value&lt;/key&gt;
-			&lt;array&gt;
-				&lt;dict&gt;
-					&lt;key&gt;mcx_typehint&lt;/key&gt;
-					&lt;integer&gt;1&lt;/integer&gt;
-					&lt;key&gt;tile-data&lt;/key&gt;
-					&lt;dict&gt;
-						&lt;key&gt;file-data&lt;/key&gt;
-						&lt;dict&gt;
-							&lt;key&gt;_CFURLString&lt;/key&gt;
-							&lt;string&gt;/Applications/Mail.app&lt;/string&gt;
-							&lt;key&gt;_CFURLStringType&lt;/key&gt;
-							&lt;integer&gt;0&lt;/integer&gt;
-						&lt;/dict&gt;
-						&lt;key&gt;file-label&lt;/key&gt;
-						&lt;string&gt;Mail&lt;/string&gt;
-					&lt;/dict&gt;
-					&lt;key&gt;tile-type&lt;/key&gt;
-					&lt;string&gt;file-tile&lt;/string&gt;
-				&lt;/dict&gt;
-				&lt;dict&gt;
-					&lt;key&gt;mcx_typehint&lt;/key&gt;
-					&lt;integer&gt;1&lt;/integer&gt;
-					&lt;key&gt;tile-data&lt;/key&gt;
-					&lt;dict&gt;
-						&lt;key&gt;file-data&lt;/key&gt;
-						&lt;dict&gt;
-							&lt;key&gt;_CFURLString&lt;/key&gt;
-							&lt;string&gt;/Applications/Safari.app&lt;/string&gt;
-							&lt;key&gt;_CFURLStringType&lt;/key&gt;
-							&lt;integer&gt;0&lt;/integer&gt;
-						&lt;/dict&gt;
-						&lt;key&gt;file-label&lt;/key&gt;
-						&lt;string&gt;Safari&lt;/string&gt;
-					&lt;/dict&gt;
-					&lt;key&gt;tile-type&lt;/key&gt;
-					&lt;string&gt;file-tile&lt;/string&gt;
-				&lt;/dict&gt;
-			&lt;/array&gt;
-		&lt;/dict&gt;
-		&lt;key&gt;DocItems-Raw&lt;/key&gt;
-		&lt;dict&gt;
-			&lt;key&gt;state&lt;/key&gt;
-			&lt;string&gt;always&lt;/string&gt;
-			&lt;key&gt;upk&lt;/key&gt;
-			&lt;dict&gt;
-				&lt;key&gt;mcx_input_key_names&lt;/key&gt;
-				&lt;array&gt;
-					&lt;string&gt;DocItems-Raw&lt;/string&gt;
-				&lt;/array&gt;
-				&lt;key&gt;mcx_output_key_name&lt;/key&gt;
-				&lt;string&gt;static-others&lt;/string&gt;
-				&lt;key&gt;mcx_remove_duplicates&lt;/key&gt;
-				&lt;true/&gt;
-			&lt;/dict&gt;
-			&lt;key&gt;value&lt;/key&gt;
-			&lt;array/&gt;
-		&lt;/dict&gt;
-		&lt;key&gt;MCXDockSpecialFolders-Raw&lt;/key&gt;
-		&lt;dict&gt;
-			&lt;key&gt;state&lt;/key&gt;
-			&lt;string&gt;always&lt;/string&gt;
-			&lt;key&gt;upk&lt;/key&gt;
-			&lt;dict&gt;
-				&lt;key&gt;mcx_input_key_names&lt;/key&gt;
-				&lt;array&gt;
-					&lt;string&gt;MCXDockSpecialFolders-Raw&lt;/string&gt;
-				&lt;/array&gt;
-				&lt;key&gt;mcx_output_key_name&lt;/key&gt;
-				&lt;string&gt;MCXDockSpecialFolders&lt;/string&gt;
-				&lt;key&gt;mcx_remove_duplicates&lt;/key&gt;
-				&lt;true/&gt;
-			&lt;/dict&gt;
-			&lt;key&gt;value&lt;/key&gt;
-			&lt;array/&gt;
-		&lt;/dict&gt;
-		&lt;key&gt;contents-immutable&lt;/key&gt;
-		&lt;dict&gt;
-			&lt;key&gt;state&lt;/key&gt;
-			&lt;string&gt;always&lt;/string&gt;
-			&lt;key&gt;value&lt;/key&gt;
-			&lt;false/&gt;
-		&lt;/dict&gt;
-		&lt;key&gt;static-only&lt;/key&gt;
-		&lt;dict&gt;
-			&lt;key&gt;state&lt;/key&gt;
-			&lt;string&gt;always&lt;/string&gt;
-			&lt;key&gt;value&lt;/key&gt;
-			&lt;false/&gt;
-		&lt;/dict&gt;
-	&lt;/dict&gt;
+    &lt;key&gt;com.apple.dock&lt;/key&gt;
+    &lt;dict&gt;
+        &lt;key&gt;AppItems-Raw&lt;/key&gt;
+        &lt;dict&gt;
+            &lt;key&gt;state&lt;/key&gt;
+            &lt;string&gt;always&lt;/string&gt;
+            &lt;key&gt;upk&lt;/key&gt;
+            &lt;dict&gt;
+                &lt;key&gt;mcx_input_key_names&lt;/key&gt;
+                &lt;array&gt;
+                    &lt;string&gt;AppItems-Raw&lt;/string&gt;
+                &lt;/array&gt;
+                &lt;key&gt;mcx_output_key_name&lt;/key&gt;
+                &lt;string&gt;static-apps&lt;/string&gt;
+                &lt;key&gt;mcx_remove_duplicates&lt;/key&gt;
+                &lt;true/&gt;
+            &lt;/dict&gt;
+            &lt;key&gt;value&lt;/key&gt;
+            &lt;array&gt;
+                &lt;dict&gt;
+                    &lt;key&gt;mcx_typehint&lt;/key&gt;
+                    &lt;integer&gt;1&lt;/integer&gt;
+                    &lt;key&gt;tile-data&lt;/key&gt;
+                    &lt;dict&gt;
+                        &lt;key&gt;file-data&lt;/key&gt;
+                        &lt;dict&gt;
+                            &lt;key&gt;_CFURLString&lt;/key&gt;
+                            &lt;string&gt;/Applications/Mail.app&lt;/string&gt;
+                            &lt;key&gt;_CFURLStringType&lt;/key&gt;
+                            &lt;integer&gt;0&lt;/integer&gt;
+                        &lt;/dict&gt;
+                        &lt;key&gt;file-label&lt;/key&gt;
+                        &lt;string&gt;Mail&lt;/string&gt;
+                    &lt;/dict&gt;
+                    &lt;key&gt;tile-type&lt;/key&gt;
+                    &lt;string&gt;file-tile&lt;/string&gt;
+                &lt;/dict&gt;
+                &lt;dict&gt;
+                    &lt;key&gt;mcx_typehint&lt;/key&gt;
+                    &lt;integer&gt;1&lt;/integer&gt;
+                    &lt;key&gt;tile-data&lt;/key&gt;
+                    &lt;dict&gt;
+                        &lt;key&gt;file-data&lt;/key&gt;
+                        &lt;dict&gt;
+                            &lt;key&gt;_CFURLString&lt;/key&gt;
+                            &lt;string&gt;/Applications/Safari.app&lt;/string&gt;
+                            &lt;key&gt;_CFURLStringType&lt;/key&gt;
+                            &lt;integer&gt;0&lt;/integer&gt;
+                        &lt;/dict&gt;
+                        &lt;key&gt;file-label&lt;/key&gt;
+                        &lt;string&gt;Safari&lt;/string&gt;
+                    &lt;/dict&gt;
+                    &lt;key&gt;tile-type&lt;/key&gt;
+                    &lt;string&gt;file-tile&lt;/string&gt;
+                &lt;/dict&gt;
+            &lt;/array&gt;
+        &lt;/dict&gt;
+        &lt;key&gt;DocItems-Raw&lt;/key&gt;
+        &lt;dict&gt;
+            &lt;key&gt;state&lt;/key&gt;
+            &lt;string&gt;always&lt;/string&gt;
+            &lt;key&gt;upk&lt;/key&gt;
+            &lt;dict&gt;
+                &lt;key&gt;mcx_input_key_names&lt;/key&gt;
+                &lt;array&gt;
+                    &lt;string&gt;DocItems-Raw&lt;/string&gt;
+                &lt;/array&gt;
+                &lt;key&gt;mcx_output_key_name&lt;/key&gt;
+                &lt;string&gt;static-others&lt;/string&gt;
+                &lt;key&gt;mcx_remove_duplicates&lt;/key&gt;
+                &lt;true/&gt;
+            &lt;/dict&gt;
+            &lt;key&gt;value&lt;/key&gt;
+            &lt;array/&gt;
+        &lt;/dict&gt;
+        &lt;key&gt;MCXDockSpecialFolders-Raw&lt;/key&gt;
+        &lt;dict&gt;
+            &lt;key&gt;state&lt;/key&gt;
+            &lt;string&gt;always&lt;/string&gt;
+            &lt;key&gt;upk&lt;/key&gt;
+            &lt;dict&gt;
+                &lt;key&gt;mcx_input_key_names&lt;/key&gt;
+                &lt;array&gt;
+                    &lt;string&gt;MCXDockSpecialFolders-Raw&lt;/string&gt;
+                &lt;/array&gt;
+                &lt;key&gt;mcx_output_key_name&lt;/key&gt;
+                &lt;string&gt;MCXDockSpecialFolders&lt;/string&gt;
+                &lt;key&gt;mcx_remove_duplicates&lt;/key&gt;
+                &lt;true/&gt;
+            &lt;/dict&gt;
+            &lt;key&gt;value&lt;/key&gt;
+            &lt;array/&gt;
+        &lt;/dict&gt;
+        &lt;key&gt;contents-immutable&lt;/key&gt;
+        &lt;dict&gt;
+            &lt;key&gt;state&lt;/key&gt;
+            &lt;string&gt;always&lt;/string&gt;
+            &lt;key&gt;value&lt;/key&gt;
+            &lt;false/&gt;
+        &lt;/dict&gt;
+        &lt;key&gt;static-only&lt;/key&gt;
+        &lt;dict&gt;
+            &lt;key&gt;state&lt;/key&gt;
+            &lt;string&gt;always&lt;/string&gt;
+            &lt;key&gt;value&lt;/key&gt;
+            &lt;false/&gt;
+        &lt;/dict&gt;
+    &lt;/dict&gt;
 &lt;/dict&gt;
 &lt;/plist&gt;
 '</diff>
      <filename>examples/mcx_dock_full.pp</filename>
    </modified>
    <modified>
      <diff>@@ -4,114 +4,114 @@ mcx { '/Groups/doesnotexist':
 &lt;!DOCTYPE plist PUBLIC &quot;-//Apple//DTD PLIST 1.0//EN&quot; &quot;http://www.apple.com/DTDs/PropertyList-1.0.dtd&quot;&gt;
 &lt;plist version=&quot;1.0&quot;&gt;
 &lt;dict&gt;
-	&lt;key&gt;com.apple.dock&lt;/key&gt;
-	&lt;dict&gt;
-		&lt;key&gt;AppItems-Raw&lt;/key&gt;
-		&lt;dict&gt;
-			&lt;key&gt;state&lt;/key&gt;
-			&lt;string&gt;always&lt;/string&gt;
-			&lt;key&gt;upk&lt;/key&gt;
-			&lt;dict&gt;
-				&lt;key&gt;mcx_input_key_names&lt;/key&gt;
-				&lt;array&gt;
-					&lt;string&gt;AppItems-Raw&lt;/string&gt;
-				&lt;/array&gt;
-				&lt;key&gt;mcx_output_key_name&lt;/key&gt;
-				&lt;string&gt;static-apps&lt;/string&gt;
-				&lt;key&gt;mcx_remove_duplicates&lt;/key&gt;
-				&lt;true/&gt;
-			&lt;/dict&gt;
-			&lt;key&gt;value&lt;/key&gt;
-			&lt;array&gt;
-				&lt;dict&gt;
-					&lt;key&gt;mcx_typehint&lt;/key&gt;
-					&lt;integer&gt;1&lt;/integer&gt;
-					&lt;key&gt;tile-data&lt;/key&gt;
-					&lt;dict&gt;
-						&lt;key&gt;file-data&lt;/key&gt;
-						&lt;dict&gt;
-							&lt;key&gt;_CFURLString&lt;/key&gt;
-							&lt;string&gt;/Applications/Mail.app&lt;/string&gt;
-							&lt;key&gt;_CFURLStringType&lt;/key&gt;
-							&lt;integer&gt;0&lt;/integer&gt;
-						&lt;/dict&gt;
-						&lt;key&gt;file-label&lt;/key&gt;
-						&lt;string&gt;Mail&lt;/string&gt;
-					&lt;/dict&gt;
-					&lt;key&gt;tile-type&lt;/key&gt;
-					&lt;string&gt;file-tile&lt;/string&gt;
-				&lt;/dict&gt;
-				&lt;dict&gt;
-					&lt;key&gt;mcx_typehint&lt;/key&gt;
-					&lt;integer&gt;1&lt;/integer&gt;
-					&lt;key&gt;tile-data&lt;/key&gt;
-					&lt;dict&gt;
-						&lt;key&gt;file-data&lt;/key&gt;
-						&lt;dict&gt;
-							&lt;key&gt;_CFURLString&lt;/key&gt;
-							&lt;string&gt;/Applications/Safari.app&lt;/string&gt;
-							&lt;key&gt;_CFURLStringType&lt;/key&gt;
-							&lt;integer&gt;0&lt;/integer&gt;
-						&lt;/dict&gt;
-						&lt;key&gt;file-label&lt;/key&gt;
-						&lt;string&gt;Safari&lt;/string&gt;
-					&lt;/dict&gt;
-					&lt;key&gt;tile-type&lt;/key&gt;
-					&lt;string&gt;file-tile&lt;/string&gt;
-				&lt;/dict&gt;
-			&lt;/array&gt;
-		&lt;/dict&gt;
-		&lt;key&gt;DocItems-Raw&lt;/key&gt;
-		&lt;dict&gt;
-			&lt;key&gt;state&lt;/key&gt;
-			&lt;string&gt;always&lt;/string&gt;
-			&lt;key&gt;upk&lt;/key&gt;
-			&lt;dict&gt;
-				&lt;key&gt;mcx_input_key_names&lt;/key&gt;
-				&lt;array&gt;
-					&lt;string&gt;DocItems-Raw&lt;/string&gt;
-				&lt;/array&gt;
-				&lt;key&gt;mcx_output_key_name&lt;/key&gt;
-				&lt;string&gt;static-others&lt;/string&gt;
-				&lt;key&gt;mcx_remove_duplicates&lt;/key&gt;
-				&lt;true/&gt;
-			&lt;/dict&gt;
-			&lt;key&gt;value&lt;/key&gt;
-			&lt;array/&gt;
-		&lt;/dict&gt;
-		&lt;key&gt;MCXDockSpecialFolders-Raw&lt;/key&gt;
-		&lt;dict&gt;
-			&lt;key&gt;state&lt;/key&gt;
-			&lt;string&gt;always&lt;/string&gt;
-			&lt;key&gt;upk&lt;/key&gt;
-			&lt;dict&gt;
-				&lt;key&gt;mcx_input_key_names&lt;/key&gt;
-				&lt;array&gt;
-					&lt;string&gt;MCXDockSpecialFolders-Raw&lt;/string&gt;
-				&lt;/array&gt;
-				&lt;key&gt;mcx_output_key_name&lt;/key&gt;
-				&lt;string&gt;MCXDockSpecialFolders&lt;/string&gt;
-				&lt;key&gt;mcx_remove_duplicates&lt;/key&gt;
-				&lt;true/&gt;
-			&lt;/dict&gt;
-			&lt;key&gt;value&lt;/key&gt;
-			&lt;array/&gt;
-		&lt;/dict&gt;
-		&lt;key&gt;contents-immutable&lt;/key&gt;
-		&lt;dict&gt;
-			&lt;key&gt;state&lt;/key&gt;
-			&lt;string&gt;always&lt;/string&gt;
-			&lt;key&gt;value&lt;/key&gt;
-			&lt;false/&gt;
-		&lt;/dict&gt;
-		&lt;key&gt;static-only&lt;/key&gt;
-		&lt;dict&gt;
-			&lt;key&gt;state&lt;/key&gt;
-			&lt;string&gt;always&lt;/string&gt;
-			&lt;key&gt;value&lt;/key&gt;
-			&lt;false/&gt;
-		&lt;/dict&gt;
-	&lt;/dict&gt;
+    &lt;key&gt;com.apple.dock&lt;/key&gt;
+    &lt;dict&gt;
+        &lt;key&gt;AppItems-Raw&lt;/key&gt;
+        &lt;dict&gt;
+            &lt;key&gt;state&lt;/key&gt;
+            &lt;string&gt;always&lt;/string&gt;
+            &lt;key&gt;upk&lt;/key&gt;
+            &lt;dict&gt;
+                &lt;key&gt;mcx_input_key_names&lt;/key&gt;
+                &lt;array&gt;
+                    &lt;string&gt;AppItems-Raw&lt;/string&gt;
+                &lt;/array&gt;
+                &lt;key&gt;mcx_output_key_name&lt;/key&gt;
+                &lt;string&gt;static-apps&lt;/string&gt;
+                &lt;key&gt;mcx_remove_duplicates&lt;/key&gt;
+                &lt;true/&gt;
+            &lt;/dict&gt;
+            &lt;key&gt;value&lt;/key&gt;
+            &lt;array&gt;
+                &lt;dict&gt;
+                    &lt;key&gt;mcx_typehint&lt;/key&gt;
+                    &lt;integer&gt;1&lt;/integer&gt;
+                    &lt;key&gt;tile-data&lt;/key&gt;
+                    &lt;dict&gt;
+                        &lt;key&gt;file-data&lt;/key&gt;
+                        &lt;dict&gt;
+                            &lt;key&gt;_CFURLString&lt;/key&gt;
+                            &lt;string&gt;/Applications/Mail.app&lt;/string&gt;
+                            &lt;key&gt;_CFURLStringType&lt;/key&gt;
+                            &lt;integer&gt;0&lt;/integer&gt;
+                        &lt;/dict&gt;
+                        &lt;key&gt;file-label&lt;/key&gt;
+                        &lt;string&gt;Mail&lt;/string&gt;
+                    &lt;/dict&gt;
+                    &lt;key&gt;tile-type&lt;/key&gt;
+                    &lt;string&gt;file-tile&lt;/string&gt;
+                &lt;/dict&gt;
+                &lt;dict&gt;
+                    &lt;key&gt;mcx_typehint&lt;/key&gt;
+                    &lt;integer&gt;1&lt;/integer&gt;
+                    &lt;key&gt;tile-data&lt;/key&gt;
+                    &lt;dict&gt;
+                        &lt;key&gt;file-data&lt;/key&gt;
+                        &lt;dict&gt;
+                            &lt;key&gt;_CFURLString&lt;/key&gt;
+                            &lt;string&gt;/Applications/Safari.app&lt;/string&gt;
+                            &lt;key&gt;_CFURLStringType&lt;/key&gt;
+                            &lt;integer&gt;0&lt;/integer&gt;
+                        &lt;/dict&gt;
+                        &lt;key&gt;file-label&lt;/key&gt;
+                        &lt;string&gt;Safari&lt;/string&gt;
+                    &lt;/dict&gt;
+                    &lt;key&gt;tile-type&lt;/key&gt;
+                    &lt;string&gt;file-tile&lt;/string&gt;
+                &lt;/dict&gt;
+            &lt;/array&gt;
+        &lt;/dict&gt;
+        &lt;key&gt;DocItems-Raw&lt;/key&gt;
+        &lt;dict&gt;
+            &lt;key&gt;state&lt;/key&gt;
+            &lt;string&gt;always&lt;/string&gt;
+            &lt;key&gt;upk&lt;/key&gt;
+            &lt;dict&gt;
+                &lt;key&gt;mcx_input_key_names&lt;/key&gt;
+                &lt;array&gt;
+                    &lt;string&gt;DocItems-Raw&lt;/string&gt;
+                &lt;/array&gt;
+                &lt;key&gt;mcx_output_key_name&lt;/key&gt;
+                &lt;string&gt;static-others&lt;/string&gt;
+                &lt;key&gt;mcx_remove_duplicates&lt;/key&gt;
+                &lt;true/&gt;
+            &lt;/dict&gt;
+            &lt;key&gt;value&lt;/key&gt;
+            &lt;array/&gt;
+        &lt;/dict&gt;
+        &lt;key&gt;MCXDockSpecialFolders-Raw&lt;/key&gt;
+        &lt;dict&gt;
+            &lt;key&gt;state&lt;/key&gt;
+            &lt;string&gt;always&lt;/string&gt;
+            &lt;key&gt;upk&lt;/key&gt;
+            &lt;dict&gt;
+                &lt;key&gt;mcx_input_key_names&lt;/key&gt;
+                &lt;array&gt;
+                    &lt;string&gt;MCXDockSpecialFolders-Raw&lt;/string&gt;
+                &lt;/array&gt;
+                &lt;key&gt;mcx_output_key_name&lt;/key&gt;
+                &lt;string&gt;MCXDockSpecialFolders&lt;/string&gt;
+                &lt;key&gt;mcx_remove_duplicates&lt;/key&gt;
+                &lt;true/&gt;
+            &lt;/dict&gt;
+            &lt;key&gt;value&lt;/key&gt;
+            &lt;array/&gt;
+        &lt;/dict&gt;
+        &lt;key&gt;contents-immutable&lt;/key&gt;
+        &lt;dict&gt;
+            &lt;key&gt;state&lt;/key&gt;
+            &lt;string&gt;always&lt;/string&gt;
+            &lt;key&gt;value&lt;/key&gt;
+            &lt;false/&gt;
+        &lt;/dict&gt;
+        &lt;key&gt;static-only&lt;/key&gt;
+        &lt;dict&gt;
+            &lt;key&gt;state&lt;/key&gt;
+            &lt;string&gt;always&lt;/string&gt;
+            &lt;key&gt;value&lt;/key&gt;
+            &lt;false/&gt;
+        &lt;/dict&gt;
+    &lt;/dict&gt;
 &lt;/dict&gt;
 &lt;/plist&gt;
 '</diff>
      <filename>examples/mcx_nogroup.pp</filename>
    </modified>
    <modified>
      <diff>@@ -30,7 +30,7 @@
 # See: http://reductivelabs.com/trac/puppet/wiki/WritingYourOwnFunctions
 
 module Puppet::Parser::Functions
-	newfunction(:hostname_to_dn, :type =&gt; :rvalue, :doc =&gt; &quot;Given 'foo.bar.com', return 'dc=foo,dc=bar,dc=com'.&quot;) do |args|
-		args[0].split(/\./).map do |s| &quot;dc=%s&quot;%[s] end.join(&quot;,&quot;)
-	end
+    newfunction(:hostname_to_dn, :type =&gt; :rvalue, :doc =&gt; &quot;Given 'foo.bar.com', return 'dc=foo,dc=bar,dc=com'.&quot;) do |args|
+        args[0].split(/\./).map do |s| &quot;dc=%s&quot;%[s] end.join(&quot;,&quot;)
+    end
 end</diff>
      <filename>examples/modules/sample-module/lib/puppet/parser/functions/hostname_to_dn.rb</filename>
    </modified>
    <modified>
      <diff>@@ -38,20 +38,20 @@ end
 debug = false
 
 result = GetoptLong.new(
-	[ &quot;--debug&quot;,	&quot;-d&quot;,			GetoptLong::NO_ARGUMENT ],
-	[ &quot;--help&quot;,		&quot;-h&quot;,			GetoptLong::NO_ARGUMENT ]
+    [ &quot;--debug&quot;, &quot;-d&quot;, GetoptLong::NO_ARGUMENT ],
+    [ &quot;--help&quot;,  &quot;-h&quot;, GetoptLong::NO_ARGUMENT ]
 )
 
 result.each { |opt,arg|
-	case opt
-		when &quot;--help&quot;
-			puts &quot;There is no help yet&quot;
-			exit
-		when &quot;--debug&quot;
-			debug = true
-		else
-			raise &quot;Invalid option '#{opt}'&quot;
-	end
+    case opt
+    when &quot;--help&quot;
+        puts &quot;There is no help yet&quot;
+        exit
+    when &quot;--debug&quot;
+        debug = true
+    else
+        raise &quot;Invalid option '#{opt}'&quot;
+    end
 }
 
 trap(:INT) {
@@ -59,7 +59,7 @@ trap(:INT) {
 }
 
 unless debug
-	daemonize()
+    daemonize()
 end
 
 # Sleep for no more than two minutes</diff>
      <filename>ext/bin/sleeper</filename>
    </modified>
    <modified>
      <diff>@@ -52,12 +52,12 @@ require 'puppet/network/client'
 require 'getoptlong'
 
 options = [
-    [ &quot;--debug&quot;,	&quot;-d&quot;,			GetoptLong::NO_ARGUMENT ],
-    [ &quot;--help&quot;,		&quot;-h&quot;,			GetoptLong::NO_ARGUMENT ],
-    [ &quot;--logdest&quot;,	&quot;-l&quot;,			GetoptLong::REQUIRED_ARGUMENT ],
-    [ &quot;--verbose&quot;,  &quot;-v&quot;,			GetoptLong::NO_ARGUMENT ],
-    [ &quot;--use-nodes&quot;,    			GetoptLong::NO_ARGUMENT ],
-    [ &quot;--version&quot;,  &quot;-V&quot;,           GetoptLong::NO_ARGUMENT ]
+    [ &quot;--debug&quot;,     &quot;-d&quot;, GetoptLong::NO_ARGUMENT       ],
+    [ &quot;--help&quot;,      &quot;-h&quot;, GetoptLong::NO_ARGUMENT       ],
+    [ &quot;--logdest&quot;,   &quot;-l&quot;, GetoptLong::REQUIRED_ARGUMENT ],
+    [ &quot;--verbose&quot;,   &quot;-v&quot;, GetoptLong::NO_ARGUMENT       ],
+    [ &quot;--use-nodes&quot;,       GetoptLong::NO_ARGUMENT       ],
+    [ &quot;--version&quot;,   &quot;-V&quot;, GetoptLong::NO_ARGUMENT       ]
 ]
 
 # Add all of the config parameters as valid options.</diff>
      <filename>ext/module_puppet</filename>
    </modified>
    <modified>
      <diff>@@ -225,10 +225,10 @@ class NagiosWriter
 end
 
 arguments = [
-    [ &quot;--compare&quot;,	&quot;-c&quot;,			GetoptLong::NO_ARGUMENT ],
-    [ &quot;--debug&quot;,	&quot;-d&quot;,			GetoptLong::NO_ARGUMENT ],
-    [ &quot;--verbose&quot;,  &quot;-v&quot;,			GetoptLong::NO_ARGUMENT ],
-    [ &quot;--help&quot;,		&quot;-h&quot;,			GetoptLong::NO_ARGUMENT ]
+    [ &quot;--compare&quot;, &quot;-c&quot;, GetoptLong::NO_ARGUMENT ],
+    [ &quot;--debug&quot;,   &quot;-d&quot;, GetoptLong::NO_ARGUMENT ],
+    [ &quot;--verbose&quot;, &quot;-v&quot;, GetoptLong::NO_ARGUMENT ],
+    [ &quot;--help&quot;,    &quot;-h&quot;, GetoptLong::NO_ARGUMENT ]
 ]
 
 Puppet.settings.addargs(arguments)
@@ -237,8 +237,8 @@ result = GetoptLong.new(*arguments)
 
 $options = {}
 result.each { |opt,arg|
-	case opt
-		when &quot;--help&quot;
+    case opt
+        when &quot;--help&quot;
             begin
                 require 'rdoc/usage'
                 RDoc::usage &amp;&amp; exit
@@ -264,9 +264,9 @@ result.each { |opt,arg|
             $options[:debug] = true
         when &quot;--debug&quot;
             $options[:debug] = true
-		else
+    else
             Puppet.settings.handlearg(opt, arg)
-	end
+    end
 }
 
 # Read in Puppet settings, so we know how Puppet's configured.</diff>
      <filename>ext/nagios/naggen</filename>
    </modified>
    <modified>
      <diff>@@ -408,21 +408,21 @@ end
 
 
 $cmdargs = [
-	[ &quot;--compile&quot;,    &quot;-c&quot;,			GetoptLong::NO_ARGUMENT ],
-	[ &quot;--describe&quot;,     			GetoptLong::REQUIRED_ARGUMENT ],
-	[ &quot;--retrieve&quot;,  &quot;-R&quot;,			GetoptLong::REQUIRED_ARGUMENT ],
-	[ &quot;--fork&quot;,          			GetoptLong::REQUIRED_ARGUMENT ],
-	[ &quot;--fqdn&quot;,      &quot;-F&quot;,			GetoptLong::REQUIRED_ARGUMENT ],
-	[ &quot;--suite&quot;,     &quot;-s&quot;,			GetoptLong::REQUIRED_ARGUMENT ],
-	[ &quot;--test&quot;,      &quot;-t&quot;,			GetoptLong::REQUIRED_ARGUMENT ],
-	[ &quot;--pause&quot;,	 &quot;-p&quot;,			GetoptLong::NO_ARGUMENT ],
-	[ &quot;--repeat&quot;,    &quot;-r&quot;,			GetoptLong::REQUIRED_ARGUMENT ],
-	[ &quot;--node&quot;,      &quot;-n&quot;,			GetoptLong::REQUIRED_ARGUMENT ],
-	[ &quot;--debug&quot;,	 &quot;-d&quot;,			GetoptLong::NO_ARGUMENT ],
-	[ &quot;--help&quot;,		 &quot;-h&quot;,			GetoptLong::NO_ARGUMENT ],
-	[ &quot;--list&quot;,	     &quot;-l&quot;,			GetoptLong::NO_ARGUMENT ],
-	[ &quot;--verbose&quot;,	 &quot;-v&quot;,			GetoptLong::NO_ARGUMENT ],
-	[ &quot;--version&quot;,	 &quot;-V&quot;,			GetoptLong::NO_ARGUMENT ],
+    [ &quot;--compile&quot;,  &quot;-c&quot;, GetoptLong::NO_ARGUMENT       ],
+    [ &quot;--describe&quot;,       GetoptLong::REQUIRED_ARGUMENT ],
+    [ &quot;--retrieve&quot;, &quot;-R&quot;, GetoptLong::REQUIRED_ARGUMENT ],
+    [ &quot;--fork&quot;,           GetoptLong::REQUIRED_ARGUMENT ],
+    [ &quot;--fqdn&quot;,     &quot;-F&quot;, GetoptLong::REQUIRED_ARGUMENT ],
+    [ &quot;--suite&quot;,    &quot;-s&quot;, GetoptLong::REQUIRED_ARGUMENT ],
+    [ &quot;--test&quot;,     &quot;-t&quot;, GetoptLong::REQUIRED_ARGUMENT ],
+    [ &quot;--pause&quot;,    &quot;-p&quot;, GetoptLong::NO_ARGUMENT       ],
+    [ &quot;--repeat&quot;,   &quot;-r&quot;, GetoptLong::REQUIRED_ARGUMENT ],
+    [ &quot;--node&quot;,     &quot;-n&quot;, GetoptLong::REQUIRED_ARGUMENT ],
+    [ &quot;--debug&quot;,    &quot;-d&quot;, GetoptLong::NO_ARGUMENT       ],
+    [ &quot;--help&quot;,     &quot;-h&quot;, GetoptLong::NO_ARGUMENT       ],
+    [ &quot;--list&quot;,     &quot;-l&quot;, GetoptLong::NO_ARGUMENT       ],
+    [ &quot;--verbose&quot;,  &quot;-v&quot;, GetoptLong::NO_ARGUMENT       ],
+    [ &quot;--version&quot;,  &quot;-V&quot;, GetoptLong::NO_ARGUMENT       ],
 ]
 
 # Add all of the config parameters as valid $options.</diff>
      <filename>ext/puppet-test</filename>
    </modified>
    <modified>
      <diff>@@ -11,36 +11,36 @@ require 'getoptlong'
 config = '/etc/puppet/puppet.conf'
 
 def printusage(error_code)
-	puts &quot;Usage: #{$0} [ list of hostnames as stored in hosts table ]&quot;
-	puts &quot;\n Options:&quot;
-	puts &quot;--config &lt;puppet config file&gt;&quot;
-	exit(error_code)
+    puts &quot;Usage: #{$0} [ list of hostnames as stored in hosts table ]&quot;
+    puts &quot;\n Options:&quot;
+    puts &quot;--config &lt;puppet config file&gt;&quot;
+    exit(error_code)
 end
 
 opts = GetoptLong.new(
-        [ &quot;--config&quot;,     &quot;-c&quot;,   GetoptLong::REQUIRED_ARGUMENT ],	
+        [ &quot;--config&quot;,     &quot;-c&quot;,   GetoptLong::REQUIRED_ARGUMENT ],
         [ &quot;--help&quot;,        &quot;-h&quot;,   GetoptLong::NO_ARGUMENT ],
         [ &quot;--usage&quot;,       &quot;-u&quot;,   GetoptLong::NO_ARGUMENT ],
         [ &quot;--version&quot;,     &quot;-v&quot;,   GetoptLong::NO_ARGUMENT ]
 )
 
 begin
-	opts.each do |opt, arg|
-    	case opt
-        	when &quot;--config&quot;
-				config = arg
+    opts.each do |opt, arg|
+        case opt
+        when &quot;--config&quot;
+            config = arg
 
-            when &quot;--help&quot;
-            	printusage(0)
+        when &quot;--help&quot;
+            printusage(0)
 
-            when &quot;--usage&quot;
-            	printusage(0)
+        when &quot;--usage&quot;
+            printusage(0)
 
-            when &quot;--version&quot;
-        		puts &quot;%s&quot; % Puppet.version
-				exit
-		end
-	end
+        when &quot;--version&quot;
+            puts &quot;%s&quot; % Puppet.version
+            exit
+        end
+    end
 rescue GetoptLong::InvalidOption =&gt; detail
     $stderr.puts &quot;Try '#{$0} --help'&quot;
     exit(1)</diff>
      <filename>ext/puppetstoredconfigclean.rb</filename>
    </modified>
    <modified>
      <diff>@@ -355,24 +355,24 @@ def build_man(bins)
 end
 
 def run_tests(test_list)
-	begin
-		require 'test/unit/ui/console/testrunner'
-		$:.unshift &quot;lib&quot;
-		test_list.each do |test|
-		next if File.directory?(test)
-		require test
-		end
-
-		tests = []
-		ObjectSpace.each_object { |o| tests &lt;&lt; o if o.kind_of?(Class) } 
-		tests.delete_if { |o| !o.ancestors.include?(Test::Unit::TestCase) }
-		tests.delete_if { |o| o == Test::Unit::TestCase }
-
-		tests.each { |test| Test::Unit::UI::Console::TestRunner.run(test) }
-		$:.shift
-	rescue LoadError
-		puts &quot;Missing testrunner library; skipping tests&quot;
-	end
+    begin
+        require 'test/unit/ui/console/testrunner'
+        $:.unshift &quot;lib&quot;
+        test_list.each do |test|
+            next if File.directory?(test)
+            require test
+        end
+
+        tests = []
+        ObjectSpace.each_object { |o| tests &lt;&lt; o if o.kind_of?(Class) }
+        tests.delete_if { |o| !o.ancestors.include?(Test::Unit::TestCase) }
+        tests.delete_if { |o| o == Test::Unit::TestCase }
+
+        tests.each { |test| Test::Unit::UI::Console::TestRunner.run(test) }
+        $:.shift
+    rescue LoadError
+        puts &quot;Missing testrunner library; skipping tests&quot;
+    end
 end
 
 ##</diff>
      <filename>install.rb</filename>
    </modified>
    <modified>
      <diff>@@ -71,8 +71,8 @@ module Puppet
         @@settings.setdefaults(section, hash)
     end
 
-	# configuration parameter access and stuff
-	def self.[](param)
+    # configuration parameter access and stuff
+    def self.[](param)
         case param
         when :debug
             if Puppet::Util::Log.level == :debug
@@ -83,12 +83,12 @@ module Puppet
         else
             return @@settings[param]
         end
-	end
+    end
 
-	# configuration parameter access and stuff
-	def self.[]=(param,value)
+    # configuration parameter access and stuff
+    def self.[]=(param,value)
         @@settings[param] = value
-	end
+    end
 
     def self.clear
         @@settings.clear</diff>
      <filename>lib/puppet.rb</filename>
    </modified>
    <modified>
      <diff>@@ -229,7 +229,7 @@ module DOT
             t + &quot;]\n&quot; 
       end
 
-  end		# class DOTNode
+  end # class DOTNode
 
   # A subgraph element is the same to graph, but has another header in dot
   # notation.
@@ -276,7 +276,7 @@ module DOT
       hdr + options + nodes + t + &quot;}\n&quot;
     end
 
-  end		# class DOTSubgraph
+  end # class DOTSubgraph
 
   # This is a graph.
 
@@ -287,7 +287,7 @@ module DOT
       @dot_string = 'digraph'
     end
 
-  end		# class DOTDigraph
+  end # class DOTDigraph
 
   # This is an edge.
 
@@ -314,7 +314,7 @@ module DOT
           }.compact.join( &quot;\n&quot; ) + &quot;\n&quot; + t + &quot;]\n&quot;
     end
 
-  end		# class DOTEdge
+  end # class DOTEdge
           
   class DOTDirectedEdge &lt; DOTEdge
 </diff>
      <filename>lib/puppet/external/dot.rb</filename>
    </modified>
    <modified>
      <diff>@@ -27,24 +27,24 @@ module Nagios
         NAGIOSVERSION
     end
 
-	class Config
-		def Config.import(config)
-
-			text = String.new
-
-			File.open(config) { |file|
-				file.each { |line|
-					text += line
-				}
-			}
-			parser = Nagios::Parser.new
-			return parser.parse(text)
-		end
-		
-		def Config.each
-			Nagios::Object.objects.each { |object|
-				yield object
-			}
-		end
-	end
+    class Config
+        def Config.import(config)
+
+            text = String.new
+
+            File.open(config) { |file|
+                file.each { |line|
+                    text += line
+                }
+            }
+            parser = Nagios::Parser.new
+            return parser.parse(text)
+        end
+
+        def Config.each
+            Nagios::Object.objects.each { |object|
+                yield object
+            }
+        end
+    end
 end</diff>
      <filename>lib/puppet/external/nagios.rb</filename>
    </modified>
    <modified>
      <diff>@@ -5,51 +5,51 @@ token DEFINE NAME STRING PARAM LCURLY RCURLY VALUE RETURN COMMENT INLINECOMMENT
 
 rule
 decls: decl { return val[0] if val[0] }
-	| decls decl {
-		if val[1].nil?
-			result = val[0]
-		else
-			if val[0].nil?
-				result = val[1]
-			else
-				result = [ val[0], val[1] ].flatten
-			end
-		end
-	}
-	;
+    | decls decl {
+        if val[1].nil?
+            result = val[0]
+        else
+            if val[0].nil?
+                result = val[1]
+            else
+                result = [ val[0], val[1] ].flatten
+            end
+        end
+    }
+    ;
 
 decl: object { result = [val[0]] }
-	| RETURN { result = nil }
-	| comment
-	;
-	
+    | RETURN { result = nil }
+    | comment
+    ;
+
 comment: COMMENT RETURN { result = nil }
-	;
+    ;
 
 object: DEFINE NAME LCURLY RETURN vars RCURLY {
-		result = Nagios::Base.create(val[1],val[4])
-	}
-	;
+        result = Nagios::Base.create(val[1],val[4])
+    }
+    ;
 
 vars: var
-	| vars var {
-		val[1].each {|p,v|
-			val[0][p] = v
-		}
-		result = val[0]
-	}
-	;
+    | vars var {
+        val[1].each {|p,v|
+            val[0][p] = v
+        }
+        result = val[0]
+    }
+    ;
 
 var: PARAM VALUE icomment returns { result = {val[0],val[1]} }
-	;
+    ;
 
 returns:      RETURN
             | returns RETURN
             ;
 
 icomment: # nothing
-	| INLINECOMMENT
-	;
+    | INLINECOMMENT
+    ;
 
 end
 
@@ -58,61 +58,61 @@ end
 class ::Nagios::Parser::SyntaxError &lt; RuntimeError; end
 
 def parse(src)
-	@src = src
+    @src = src
 
-	# state variables
-	@invar = false
-	@inobject = false
-	@done = false
+    # state variables
+    @invar = false
+    @inobject = false
+    @done = false
 
-	@line = 0
-	@yydebug = true
+    @line = 0
+    @yydebug = true
 
     do_parse
 end
 
 # The lexer.  Very simple.
 def token
-	@src.sub!(/\A\n/,'')
-	if $&amp;
-		@line += 1
-		return [ :RETURN, &quot;\n&quot; ]
-	end
-
-	if @done
-		return nil
-	end
-	yytext = String.new
-
-
-	# remove comments from this line
-	@src.sub!(/\A[ \t]*;.*\n/,&quot;\n&quot;)
-	if $&amp;
-		return [:INLINECOMMENT, &quot;&quot;]
-	end
-
-	@src.sub!(/\A#.*\n/,&quot;\n&quot;)
-	if $&amp;
-		return [:COMMENT, &quot;&quot;]
-	end
-
-	@src.sub!(/#.*/,'')
-
-	if @src.length == 0
-		@done = true
-		return [false, '$']
-	end
-
-	if @invar
-		@src.sub!(/\A[ \t]+/,'')
-		@src.sub!(/\A([^;\n]+)(\n|;)/,'\2')
-		if $1
-			yytext += $1
-		end
-		@invar = false
-		return [:VALUE, yytext]
-	else
-		@src.sub!(/\A[\t ]*(\S+)([\t ]*|$)/,'')
+    @src.sub!(/\A\n/,'')
+    if $&amp;
+        @line += 1
+        return [ :RETURN, &quot;\n&quot; ]
+    end
+
+    if @done
+        return nil
+    end
+    yytext = String.new
+
+
+    # remove comments from this line
+    @src.sub!(/\A[ \t]*;.*\n/,&quot;\n&quot;)
+    if $&amp;
+        return [:INLINECOMMENT, &quot;&quot;]
+    end
+
+    @src.sub!(/\A#.*\n/,&quot;\n&quot;)
+    if $&amp;
+        return [:COMMENT, &quot;&quot;]
+    end
+
+    @src.sub!(/#.*/,'')
+
+    if @src.length == 0
+        @done = true
+        return [false, '$']
+    end
+
+    if @invar
+        @src.sub!(/\A[ \t]+/,'')
+        @src.sub!(/\A([^;\n]+)(\n|;)/,'\2')
+        if $1
+            yytext += $1
+        end
+        @invar = false
+        return [:VALUE, yytext]
+    else
+        @src.sub!(/\A[\t ]*(\S+)([\t ]*|$)/,'')
         if $1
             yytext = $1
             case yytext
@@ -152,11 +152,11 @@ def token
                 end
             end
         end
-	end
+    end
 end
 
 def next_token
-	token
+    token
 end
 
 def yydebug
@@ -168,18 +168,18 @@ def yywrap
 end
 
 def on_error(token, value, vstack )
-	msg = &quot;&quot;
-	unless value.nil?
-		msg = &quot;line #{@line}: syntax error at '#{value}'&quot;
-	else
-		msg = &quot;line #{@line}: syntax error at '#{token}'&quot;
-	end
-	unless @src.size &gt; 0
-		msg = &quot;line #{@line}: Unexpected end of file&quot;
-	end
-	if token == '$end'.intern
-		puts &quot;okay, this is silly&quot;
-	else
-		raise ::Nagios::Parser::SyntaxError, msg
-	end
+    msg = &quot;&quot;
+    unless value.nil?
+        msg = &quot;line #{@line}: syntax error at '#{value}'&quot;
+    else
+        msg = &quot;line #{@line}: syntax error at '#{token}'&quot;
+    end
+    unless @src.size &gt; 0
+        msg = &quot;line #{@line}: Unexpected end of file&quot;
+    end
+    if token == '$end'.intern
+        puts &quot;okay, this is silly&quot;
+    else
+        raise ::Nagios::Parser::SyntaxError, msg
+    end
 end</diff>
      <filename>lib/puppet/external/nagios/grammar.ry</filename>
    </modified>
    <modified>
      <diff>@@ -1,6 +1,6 @@
 module Puppet::Parser::Functions
     newfunction(:regsubst, :type =&gt; :rvalue,
-		:doc =&gt; &quot;
+                :doc =&gt; &quot;
                 Perform regexp replacement on a string. 
 
 - **Parameters** (in order):
@@ -36,36 +36,36 @@ Put angle brackets around each octet in the node's IP address::
     $x = regsubst($ipaddress, '([0-9]+)', '&lt;\\1&gt;', 'G')
 &quot;) \
         do |args|
-	flag_mapping = {
-	    &quot;E&quot; =&gt; Regexp::EXTENDED,
-	    &quot;I&quot; =&gt; Regexp::IGNORECASE,
-	    &quot;M&quot; =&gt; Regexp::MULTILINE,
-	}
-	if args.length &lt; 3  or  args.length &gt; 5
-	    raise Puppet::ParseError, (&quot;regsub(): wrong number of arguments&quot; +
-				       &quot; (#{args.length}; min 3, max 5)&quot;)
-	end
-	str, regexp, replacement, flags, lang = args
-	reflags = 0
-	global = false
-	(flags or &quot;&quot;).each_byte do |f|
-	    f = f.chr
-	    if f == &quot;G&quot;
-		global = true
-	    else
-		fvalue = flag_mapping[f]
-		if !fvalue
-		    raise Puppet::ParseError, &quot;regsub(): bad flag `#{f}'&quot;
-		end
-		reflags |= fvalue
-	    end
-	end
-	re = Regexp.compile(regexp, reflags, lang)
-	if global
-	    result = str.gsub(re, replacement)
-	else
-	    result = str.sub(re, replacement)
-	end
-	return result
+        flag_mapping = {
+            &quot;E&quot; =&gt; Regexp::EXTENDED,
+            &quot;I&quot; =&gt; Regexp::IGNORECASE,
+            &quot;M&quot; =&gt; Regexp::MULTILINE,
+        }
+        if args.length &lt; 3  or  args.length &gt; 5
+            raise Puppet::ParseError, (&quot;regsub(): wrong number of arguments&quot; +
+                                       &quot; (#{args.length}; min 3, max 5)&quot;)
+        end
+        str, regexp, replacement, flags, lang = args
+        reflags = 0
+        global = false
+        (flags or &quot;&quot;).each_byte do |f|
+            f = f.chr
+            if f == &quot;G&quot;
+                global = true
+            else
+                fvalue = flag_mapping[f]
+                if !fvalue
+                    raise Puppet::ParseError, &quot;regsub(): bad flag `#{f}'&quot;
+                end
+                reflags |= fvalue
+            end
+        end
+        re = Regexp.compile(regexp, reflags, lang)
+        if global
+            result = str.gsub(re, replacement)
+        else
+            result = str.sub(re, replacement)
+        end
+        return result
     end
 end</diff>
      <filename>lib/puppet/parser/functions/regsubst.rb</filename>
    </modified>
    <modified>
      <diff>@@ -1,12 +1,12 @@
 module Puppet::Parser::Functions
     newfunction(:sprintf, :type =&gt; :rvalue,
-		:doc =&gt; &quot;Perform printf-style formatting of text.
+        :doc =&gt; &quot;Perform printf-style formatting of text.
 
                          The first parameter is format string describing how the rest of the parameters should be formatted.  See the documentation for the ``Kernel::sprintf()`` function in Ruby for all the details.&quot;) do |args|
-	if args.length &lt; 1
-	    raise Puppet::ParseError, 'sprintf() needs at least one argument'
-	end
-	fmt = args.shift()
-	return sprintf(fmt, *args)
+        if args.length &lt; 1
+            raise Puppet::ParseError, 'sprintf() needs at least one argument'
+        end
+        fmt = args.shift()
+        return sprintf(fmt, *args)
     end
 end</diff>
      <filename>lib/puppet/parser/functions/sprintf.rb</filename>
    </modified>
    <modified>
      <diff>@@ -20,7 +20,7 @@ Puppet::Type.type(:package).provide(:appdmg, :parent =&gt; Puppet::Provider::Packag
     commands :hdiutil =&gt; &quot;/usr/bin/hdiutil&quot;
     commands :curl =&gt; &quot;/usr/bin/curl&quot;
     commands :ditto =&gt; &quot;/usr/bin/ditto&quot;
-	
+
     # JJM We store a cookie for each installed .app.dmg in /var/db
     def self.instances_by_name
         Dir.entries(&quot;/var/db&quot;).find_all { |f|
@@ -40,7 +40,7 @@ Puppet::Type.type(:package).provide(:appdmg, :parent =&gt; Puppet::Provider::Packag
     
     def self.installapp(source, name, orig_source)
       appname = File.basename(source);
-	  ditto &quot;--rsrc&quot;, source, &quot;/Applications/#{appname}&quot;
+      ditto &quot;--rsrc&quot;, source, &quot;/Applications/#{appname}&quot;
       File.open(&quot;/var/db/.puppet_appdmg_installed_#{name}&quot;, &quot;w&quot;) do |t|
           t.print &quot;name: '#{name}'\n&quot;
           t.print &quot;source: '#{orig_source}'\n&quot;
@@ -77,9 +77,9 @@ Puppet::Type.type(:package).provide(:appdmg, :parent =&gt; Puppet::Provider::Packag
                         mounts.each do |fspath|
                             Dir.entries(fspath).select { |f|
                                 f =~ /\.app$/i
-                                }.each do |pkg|
-					    			installapp(&quot;#{fspath}/#{pkg}&quot;, name, source)
-				 			   end
+                            }.each do |pkg|
+                                installapp(&quot;#{fspath}/#{pkg}&quot;, name, source)
+                            end
                         end # mounts.each do
                     ensure
                         hdiutil &quot;eject&quot;, mounts[0]</diff>
      <filename>lib/puppet/provider/package/appdmg.rb</filename>
    </modified>
    <modified>
      <diff>@@ -85,9 +85,9 @@ Puppet::Type.type(:package).provide :apt, :parent =&gt; :dpkg, :source =&gt; :dpkg do
         end
     end
 
-	#
-	# preseeds answers to dpkg-set-selection from the &quot;responsefile&quot;
-	#
+    #
+    # preseeds answers to dpkg-set-selection from the &quot;responsefile&quot;
+    #
     def run_preseed
         if response = @resource[:responsefile] and FileTest.exist?(response)
             self.info(&quot;Preseeding %s to debconf-set-selections&quot; % response)</diff>
      <filename>lib/puppet/provider/package/apt.rb</filename>
    </modified>
    <modified>
      <diff>@@ -26,6 +26,6 @@ Puppet::Type.type(:package).provide :aptitude, :parent =&gt; :apt, :source =&gt; :dpkg
 
     def purge
         aptitude '-y', 'purge', @resource[:name]
-	end
+    end
 end
 </diff>
      <filename>lib/puppet/provider/package/aptitude.rb</filename>
    </modified>
    <modified>
      <diff>@@ -56,9 +56,9 @@ Puppet::Type.type(:package).provide :fink, :parent =&gt; :dpkg, :source =&gt; :dpkg do
                 end
                 end
 
-	#
-	# preseeds answers to dpkg-set-selection from the &quot;responsefile&quot;
-	#
+    #
+    # preseeds answers to dpkg-set-selection from the &quot;responsefile&quot;
+    #
     def run_preseed
         if response = @resource[:responsefile] and FileTest.exists?(response)
             self.info(&quot;Preseeding %s to debconf-set-selections&quot; % response)</diff>
      <filename>lib/puppet/provider/package/fink.rb</filename>
    </modified>
    <modified>
      <diff>@@ -100,7 +100,7 @@ Puppet::Type.type(:package).provide :portage, :parent =&gt; Puppet::Provider::Packa
 
             case packages.size
                 when 0
-		    not_found_value = &quot;%s/%s&quot; % [@resource[:category] ? @resource[:category] : &quot;&lt;unspecified category&gt;&quot;, @resource[:name]]
+                    not_found_value = &quot;%s/%s&quot; % [@resource[:category] ? @resource[:category] : &quot;&lt;unspecified category&gt;&quot;, @resource[:name]]
                     raise Puppet::Error.new(&quot;No package found with the specified name [#{not_found_value}]&quot;)
                 when 1
                     return packages[0]</diff>
      <filename>lib/puppet/provider/package/portage.rb</filename>
    </modified>
    <modified>
      <diff>@@ -43,7 +43,7 @@ def pkg_lists(my):
     # Yum 2.2/2.3 python libraries require a couple of extra function calls to setup package sacks.
     # They also don't have a __version__ attribute
     try:
-	yumver = yum.__version__
+        yumver = yum.__version__
     except AttributeError:
         my.doRepoSetup()
         my.doSackSetup()</diff>
      <filename>lib/puppet/provider/package/yumhelper.py</filename>
    </modified>
    <modified>
      <diff>@@ -37,7 +37,7 @@ Puppet::Type.type(:service).provide :redhat, :parent =&gt; :init do
         if output =~ /.* off$/
             return :false
         end
-	
+
         return :true
     end
 </diff>
      <filename>lib/puppet/provider/service/redhat.rb</filename>
    </modified>
    <modified>
      <diff>@@ -20,11 +20,11 @@ Puppet::Type.type(:user).provide :hpuxuseradd, :parent =&gt; :useradd do
     has_features :manages_homedir, :allows_duplicates
 
     def deletecmd
-	super.insert(1,&quot;-F&quot;)
+        super.insert(1,&quot;-F&quot;)
     end
 
     def modifycmd(param,value)
-	super.insert(1,&quot;-F&quot;)
+        super.insert(1,&quot;-F&quot;)
     end
 
 end</diff>
      <filename>lib/puppet/provider/user/hpux.rb</filename>
    </modified>
    <modified>
      <diff>@@ -93,7 +93,7 @@ module Puppet::SSLCertificates
 
         ex &lt;&lt; ef.create_extension(&quot;keyUsage&quot;, key_usage.join(&quot;,&quot;)) if key_usage
         ex &lt;&lt; ef.create_extension(&quot;extendedKeyUsage&quot;, ext_key_usage.join(&quot;,&quot;)) if ext_key_usage
-	    ex &lt;&lt; ef.create_extension(&quot;subjectAltName&quot;, subject_alt_name.join(&quot;,&quot;)) if ! subject_alt_name.empty?
+        ex &lt;&lt; ef.create_extension(&quot;subjectAltName&quot;, subject_alt_name.join(&quot;,&quot;)) if ! subject_alt_name.empty?
 
         #if @ca_config[:cdp_location] then
         #  ex &lt;&lt; ef.create_extension(&quot;crlDistributionPoints&quot;,</diff>
      <filename>lib/puppet/sslcertificates.rb</filename>
    </modified>
    <modified>
      <diff>@@ -1397,7 +1397,7 @@ class Type
                         subscribe =&gt; File[nagconf]
                     }
                 }
-	 		
+
             Currently the ``exec``, ``mount`` and ``service`` type support
             refreshing.
             &quot;</diff>
      <filename>lib/puppet/type.rb</filename>
    </modified>
    <modified>
      <diff>@@ -45,7 +45,7 @@ module Puppet
                     end
                 end
 
-		@resource.send(:property_fix)
+                @resource.send(:property_fix)
 
                 :link_created
             end</diff>
      <filename>lib/puppet/type/file/target.rb</filename>
    </modified>
    <modified>
      <diff>@@ -4,7 +4,7 @@ module Puppet
         @doc = &quot;Manages mounted filesystems, including putting mount
             information into the mount table. The actual behavior depends 
             on the value of the 'ensure' parameter.
-	    
+
             Note that if a ``mount`` receives an event from another resource,
             it will try to remount the filesystems if ``ensure`` is set to ``mounted``.&quot;
 </diff>
      <filename>lib/puppet/type/mount.rb</filename>
    </modified>
    <modified>
      <diff>@@ -16,7 +16,7 @@ module Puppet
             command matching the service name), but the more information you
             can provide the better behaviour you will get.  Or, you can just
             use a platform that has very good service support.
-	    
+
             Note that if a ``service`` receives an event from another resource,
             the service will get restarted. The actual command to restart the
             service depends on the platform. You can provide a special command</diff>
      <filename>lib/puppet/type/service.rb</filename>
    </modified>
    <modified>
      <diff>@@ -21,9 +21,9 @@ Puppet::Type.newtype(:tidy) do
 
     newparam(:matches) do
         desc &quot;One or more (shell type) file glob patterns, which restrict
-	    the list of files to be tidied to those whose basenames match
-	    at least one of the patterns specified. Multiple patterns can
-	    be specified using an array.
+            the list of files to be tidied to those whose basenames match
+            at least one of the patterns specified. Multiple patterns can
+            be specified using an array.
 
             Example::
 </diff>
      <filename>lib/puppet/type/tidy.rb</filename>
    </modified>
    <modified>
      <diff>@@ -320,7 +320,7 @@ module Util
                 exit!(1)
             end # begin; rescue
         end # if child_pid
- 	
+
         # read output in if required
         if ! arguments[:squelch]
 </diff>
      <filename>lib/puppet/util.rb</filename>
    </modified>
    <modified>
      <diff>@@ -253,21 +253,21 @@ class Puppet::Util::Log
     newdesttype :console do
                 
         
-        RED 	= {:console =&gt; &quot;*[0;31m&quot;, :html =&gt; &quot;FFA0A0&quot;}
-        GREEN 	= {:console =&gt; &quot;*[0;32m&quot;, :html =&gt; &quot;00CD00&quot;}
-        YELLOW 	= {:console =&gt; &quot;*[0;33m&quot;, :html =&gt; &quot;FFFF60&quot;}
-        BLUE 	= {:console =&gt; &quot;*[0;34m&quot;, :html =&gt; &quot;80A0FF&quot;}
-        PURPLE 	= {:console =&gt; &quot;*[0;35m&quot;, :html =&gt; &quot;FFA500&quot;}
-        CYAN 	= {:console =&gt; &quot;*[0;36m&quot;, :html =&gt; &quot;40FFFF&quot;}
-        WHITE	= {:console =&gt; &quot;*[0;37m&quot;, :html =&gt; &quot;FFFFFF&quot;}
-        HRED	= {:console =&gt; &quot;*[1;31m&quot;, :html =&gt; &quot;FFA0A0&quot;}
-        HGREEN 	= {:console =&gt; &quot;*[1;32m&quot;, :html =&gt; &quot;00CD00&quot;}
-        HYELLOW	= {:console =&gt; &quot;*[1;33m&quot;, :html =&gt; &quot;FFFF60&quot;}
-        HBLUE 	= {:console =&gt; &quot;*[1;34m&quot;, :html =&gt; &quot;80A0FF&quot;}
-        HPURPLE	= {:console =&gt; &quot;*[1;35m&quot;, :html =&gt; &quot;FFA500&quot;}
-        HCYAN 	= {:console =&gt; &quot;*[1;36m&quot;, :html =&gt; &quot;40FFFF&quot;}
-        HWHITE	= {:console =&gt; &quot;*[1;37m&quot;, :html =&gt; &quot;FFFFFF&quot;}
-        RESET 	= {:console =&gt; &quot;*[0m&quot;, :html =&gt; &quot;&quot;}
+        RED     = {:console =&gt; &quot;*[0;31m&quot;, :html =&gt; &quot;FFA0A0&quot;}
+        GREEN   = {:console =&gt; &quot;*[0;32m&quot;, :html =&gt; &quot;00CD00&quot;}
+        YELLOW  = {:console =&gt; &quot;*[0;33m&quot;, :html =&gt; &quot;FFFF60&quot;}
+        BLUE    = {:console =&gt; &quot;*[0;34m&quot;, :html =&gt; &quot;80A0FF&quot;}
+        PURPLE  = {:console =&gt; &quot;*[0;35m&quot;, :html =&gt; &quot;FFA500&quot;}
+        CYAN    = {:console =&gt; &quot;*[0;36m&quot;, :html =&gt; &quot;40FFFF&quot;}
+        WHITE   = {:console =&gt; &quot;*[0;37m&quot;, :html =&gt; &quot;FFFFFF&quot;}
+        HRED    = {:console =&gt; &quot;*[1;31m&quot;, :html =&gt; &quot;FFA0A0&quot;}
+        HGREEN  = {:console =&gt; &quot;*[1;32m&quot;, :html =&gt; &quot;00CD00&quot;}
+        HYELLOW = {:console =&gt; &quot;*[1;33m&quot;, :html =&gt; &quot;FFFF60&quot;}
+        HBLUE   = {:console =&gt; &quot;*[1;34m&quot;, :html =&gt; &quot;80A0FF&quot;}
+        HPURPLE = {:console =&gt; &quot;*[1;35m&quot;, :html =&gt; &quot;FFA500&quot;}
+        HCYAN   = {:console =&gt; &quot;*[1;36m&quot;, :html =&gt; &quot;40FFFF&quot;}
+        HWHITE  = {:console =&gt; &quot;*[1;37m&quot;, :html =&gt; &quot;FFFFFF&quot;}
+        RESET   = {:console =&gt; &quot;*[0m&quot;,    :html =&gt; &quot;&quot;      }
 
         @@colormap = {
             :debug =&gt; WHITE,</diff>
      <filename>lib/puppet/util/log.rb</filename>
    </modified>
    <modified>
      <diff>@@ -1,68 +1,68 @@
 require 'fileutils'
 
 class Puppet::Util::Pidlock
-	attr_reader :lockfile
-	
-	def initialize(lockfile)
-		@lockfile = lockfile
-	end
-	
-	def locked?
-		clear_if_stale
-		File.exists? @lockfile
-	end
-	
-	def mine?
-		Process.pid == lock_pid
-	end
+    attr_reader :lockfile
 
-	def anonymous?
-		return false unless File.exists?(@lockfile)
-		File.read(@lockfile) == &quot;&quot;
-	end
-	
-	def lock(opts = {})
-		opts = {:anonymous =&gt; false}.merge(opts)
+    def initialize(lockfile)
+        @lockfile = lockfile
+    end
 
-		if locked?
-			mine?
-		else
-			if opts[:anonymous]
-				File.open(@lockfile, 'w') { |fd| true }
-			else
-				File.open(@lockfile, &quot;w&quot;) { |fd| fd.write(Process.pid) }
-			end
-			true
-		end
-	end
-	
-	def unlock(opts = {})
-		opts = {:anonymous =&gt; false}.merge(opts)
+    def locked?
+        clear_if_stale
+        File.exists? @lockfile
+    end
 
-		if mine? or (opts[:anonymous] and anonymous?)
-			File.unlink(@lockfile)
-			true
-		else
-			false
-		end
-	end
+    def mine?
+        Process.pid == lock_pid
+    end
 
-	private
-	def lock_pid
-		if File.exists? @lockfile
-			File.read(@lockfile).to_i
-		else
-			nil
-		end
-	end
+    def anonymous?
+        return false unless File.exists?(@lockfile)
+        File.read(@lockfile) == &quot;&quot;
+    end
 
-	def clear_if_stale
-		return if lock_pid.nil?
-		
-		begin
-			Process.kill(0, lock_pid)
-		rescue Errno::ESRCH
-			File.unlink(@lockfile)
-		end
-	end
+    def lock(opts = {})
+        opts = {:anonymous =&gt; false}.merge(opts)
+
+        if locked?
+            mine?
+        else
+            if opts[:anonymous]
+                File.open(@lockfile, 'w') { |fd| true }
+            else
+                File.open(@lockfile, &quot;w&quot;) { |fd| fd.write(Process.pid) }
+            end
+            true
+        end
+    end
+
+    def unlock(opts = {})
+        opts = {:anonymous =&gt; false}.merge(opts)
+
+        if mine? or (opts[:anonymous] and anonymous?)
+            File.unlink(@lockfile)
+            true
+        else
+            false
+        end
+    end
+
+    private
+    def lock_pid
+        if File.exists? @lockfile
+            File.read(@lockfile).to_i
+        else
+            nil
+        end
+    end
+
+    def clear_if_stale
+        return if lock_pid.nil?
+
+        begin
+            Process.kill(0, lock_pid)
+        rescue Errno::ESRCH
+            File.unlink(@lockfile)
+        end
+    end
 end</diff>
      <filename>lib/puppet/util/pidlock.rb</filename>
    </modified>
    <modified>
      <diff>@@ -6,80 +6,80 @@ require 'puppet/type/selboolean'
 require 'puppet/type/selmodule'
 
 describe Puppet::Type.type(:file), &quot; when manipulating file contexts&quot; do
-	before :each do
-	        @file = Puppet::Type::File.new(
-			:name =&gt; &quot;/tmp/foo&quot;,
-			:ensure =&gt; &quot;file&quot;,
-			:seluser =&gt; &quot;user_u&quot;,
-			:selrole =&gt; &quot;role_r&quot;,
-			:seltype =&gt; &quot;type_t&quot; )
-	end
-	it &quot;should use :seluser to get/set an SELinux user file context attribute&quot; do
-		@file.property(:seluser).should == &quot;user_u&quot;
-	end
-	it &quot;should use :selrole to get/set an SELinux role file context attribute&quot; do
-		@file.property(:selrole).should == &quot;role_r&quot;
-	end
-	it &quot;should use :seltype to get/set an SELinux user file context attribute&quot; do
-		@file.property(:seltype).should == &quot;type_t&quot;
-	end
+    before :each do
+        @file = Puppet::Type::File.new(
+            :name =&gt; &quot;/tmp/foo&quot;,
+            :ensure =&gt; &quot;file&quot;,
+            :seluser =&gt; &quot;user_u&quot;,
+            :selrole =&gt; &quot;role_r&quot;,
+            :seltype =&gt; &quot;type_t&quot; )
+    end
+    it &quot;should use :seluser to get/set an SELinux user file context attribute&quot; do
+        @file.property(:seluser).should == &quot;user_u&quot;
+    end
+    it &quot;should use :selrole to get/set an SELinux role file context attribute&quot; do
+        @file.property(:selrole).should == &quot;role_r&quot;
+    end
+    it &quot;should use :seltype to get/set an SELinux user file context attribute&quot; do
+        @file.property(:seltype).should == &quot;type_t&quot;
+    end
 end
 
 describe Puppet::Type.type(:selboolean), &quot; when manipulating booleans&quot; do
-	before :each do
+    before :each do
         provider_class = Puppet::Type::Selboolean.provider(Puppet::Type::Selboolean.providers[0])
-		Puppet::Type::Selboolean.expects(:defaultprovider).returns provider_class
+        Puppet::Type::Selboolean.expects(:defaultprovider).returns provider_class
 
-		@bool = Puppet::Type::Selboolean.new(
-			:name =&gt; &quot;foo&quot;,
-			:value =&gt; &quot;on&quot;,
-			:persistent =&gt; true )
-	end
-	it &quot;should be able to access :name&quot; do
-		@bool[:name].should == &quot;foo&quot;
-	end
-	it &quot;should be able to access :value&quot; do
-		@bool.property(:value).should == :on
-	end
-	it &quot;should set :value to off&quot; do
-		@bool[:value] = :off
-		@bool.property(:value).should == :off
-	end
-	it &quot;should be able to access :persistent&quot; do
-		@bool[:persistent].should == :true
-	end
-	it &quot;should set :persistent to false&quot; do
-		@bool[:persistent] = false
-		@bool[:persistent].should == :false
-	end
+        @bool = Puppet::Type::Selboolean.new(
+            :name =&gt; &quot;foo&quot;,
+            :value =&gt; &quot;on&quot;,
+            :persistent =&gt; true )
+    end
+    it &quot;should be able to access :name&quot; do
+        @bool[:name].should == &quot;foo&quot;
+    end
+    it &quot;should be able to access :value&quot; do
+        @bool.property(:value).should == :on
+    end
+    it &quot;should set :value to off&quot; do
+        @bool[:value] = :off
+        @bool.property(:value).should == :off
+    end
+    it &quot;should be able to access :persistent&quot; do
+        @bool[:persistent].should == :true
+    end
+    it &quot;should set :persistent to false&quot; do
+        @bool[:persistent] = false
+        @bool[:persistent].should == :false
+    end
 end
 
 describe Puppet::Type.type(:selmodule), &quot; when checking policy modules&quot; do
-	before :each do
+    before :each do
         provider_class = Puppet::Type::Selmodule.provider(Puppet::Type::Selmodule.providers[0])
-		Puppet::Type::Selmodule.expects(:defaultprovider).returns provider_class
+        Puppet::Type::Selmodule.expects(:defaultprovider).returns provider_class
 
-		@module = Puppet::Type::Selmodule.new(
-			:name =&gt; &quot;foo&quot;,
-			:selmoduledir =&gt; &quot;/some/path&quot;,
-			:selmodulepath =&gt; &quot;/some/path/foo.pp&quot;,
-			:syncversion =&gt; true)
-	end
-	it &quot;should be able to access :name&quot; do
-		@module[:name].should == &quot;foo&quot;
-	end
-	it &quot;should be able to access :selmoduledir&quot; do
-		@module[:selmoduledir].should == &quot;/some/path&quot;
-	end
-	it &quot;should be able to access :selmodulepath&quot; do
-		@module[:selmodulepath].should == &quot;/some/path/foo.pp&quot;
-	end
-	it &quot;should be able to access :syncversion&quot; do
-		@module.property(:syncversion).should == :true
-	end
-	it &quot;should set the syncversion value to false&quot; do
-		@module[:syncversion] = :false
-		@module.property(:syncversion).should == :false
-	end
+        @module = Puppet::Type::Selmodule.new(
+            :name =&gt; &quot;foo&quot;,
+            :selmoduledir =&gt; &quot;/some/path&quot;,
+            :selmodulepath =&gt; &quot;/some/path/foo.pp&quot;,
+            :syncversion =&gt; true)
+    end
+    it &quot;should be able to access :name&quot; do
+        @module[:name].should == &quot;foo&quot;
+    end
+    it &quot;should be able to access :selmoduledir&quot; do
+        @module[:selmoduledir].should == &quot;/some/path&quot;
+    end
+    it &quot;should be able to access :selmodulepath&quot; do
+        @module[:selmodulepath].should == &quot;/some/path/foo.pp&quot;
+    end
+    it &quot;should be able to access :syncversion&quot; do
+        @module.property(:syncversion).should == :true
+    end
+    it &quot;should set the syncversion value to false&quot; do
+        @module[:syncversion] = :false
+        @module.property(:syncversion).should == :false
+    end
 end
 </diff>
      <filename>spec/unit/other/selinux.rb</filename>
    </modified>
    <modified>
      <diff>@@ -4,7 +4,7 @@ require File.dirname(__FILE__) + '/../../../spec_helper'
 
 describe Puppet::Parser::AST::ArithmeticOperator do
 
-	ast = Puppet::Parser::AST
+    ast = Puppet::Parser::AST
 
     before :each do
         @scope = Puppet::Parser::Scope.new()
@@ -27,24 +27,24 @@ describe Puppet::Parser::AST::ArithmeticOperator do
     end
 
     it &quot;should call Puppet::Parser::Scope.number?&quot; do
-				Puppet::Parser::Scope.expects(:number?).with(1).returns(1)
-				Puppet::Parser::Scope.expects(:number?).with(2).returns(2)
-				
+        Puppet::Parser::Scope.expects(:number?).with(1).returns(1)
+        Puppet::Parser::Scope.expects(:number?).with(2).returns(2)
+
         ast::ArithmeticOperator.new(:lval =&gt; @one, :operator =&gt; &quot;+&quot;, :rval =&gt; @two).evaluate(@scope)
     end
 
 
-		%w{ + - * / &lt;&lt; &gt;&gt;}.each do |op|
-    	it &quot;should call ruby Numeric '#{op}'&quot; do
-					one = stub 'one'
-					two = stub 'two'
-        	operator = ast::ArithmeticOperator.new :lval =&gt; @one, :operator =&gt; op, :rval =&gt; @two
-					Puppet::Parser::Scope.stubs(:number?).with(1).returns(one)
-					Puppet::Parser::Scope.stubs(:number?).with(2).returns(two)
-					one.expects(:send).with(op,two)
-        	operator.evaluate(@scope)
-    	end
-		end
+    %w{ + - * / &lt;&lt; &gt;&gt;}.each do |op|
+        it &quot;should call ruby Numeric '#{op}'&quot; do
+            one = stub 'one'
+            two = stub 'two'
+            operator = ast::ArithmeticOperator.new :lval =&gt; @one, :operator =&gt; op, :rval =&gt; @two
+            Puppet::Parser::Scope.stubs(:number?).with(1).returns(one)
+            Puppet::Parser::Scope.stubs(:number?).with(2).returns(two)
+            one.expects(:send).with(op,two)
+            operator.evaluate(@scope)
+        end
+    end
 
     it &quot;should work even with numbers embedded in strings&quot; do
         two = stub 'two', :safeevaluate =&gt; &quot;2&quot;</diff>
      <filename>spec/unit/parser/ast/arithmetic_operator.rb</filename>
    </modified>
    <modified>
      <diff>@@ -16,7 +16,7 @@ describe Puppet::Parser::AST::BooleanOperator do
         lval = stub &quot;lval&quot;
         lval.expects(:safeevaluate).with(@scope).returns(&quot;true&quot;)
         rval = stub &quot;rval&quot;, :safeevaluate =&gt; false
-				rval.expects(:safeevaluate).never
+        rval.expects(:safeevaluate).never
         
         operator = ast::BooleanOperator.new :rval =&gt; rval, :operator =&gt; &quot;or&quot;, :lval =&gt; lval
         operator.evaluate(@scope)</diff>
      <filename>spec/unit/parser/ast/boolean_operator.rb</filename>
    </modified>
    <modified>
      <diff>@@ -14,75 +14,75 @@ describe &quot;the regsubst function&quot; do
 
     it &quot;should raise a ParseError if there is less than 3 arguments&quot; do
         lambda { @scope.function_regsubst([&quot;foo&quot;, &quot;bar&quot;]) }.should(
-		raise_error(Puppet::ParseError))
+            raise_error(Puppet::ParseError))
     end
 
     it &quot;should raise a ParseError if there is more than 5 arguments&quot; do
         lambda { @scope.function_regsubst([&quot;foo&quot;, &quot;bar&quot;, &quot;gazonk&quot;, &quot;del&quot;, &quot;x&quot;, &quot;y&quot;]) }.should(
-		raise_error(Puppet::ParseError))
+            raise_error(Puppet::ParseError))
     end
 
 
     it &quot;should raise a ParseError when given a bad flag&quot; do
         lambda { @scope.function_regsubst([&quot;foo&quot;, &quot;bar&quot;, &quot;gazonk&quot;, &quot;X&quot;]) }.should(
-		raise_error(Puppet::ParseError))
+            raise_error(Puppet::ParseError))
     end
 
     it &quot;should handle groups&quot; do
-	result = @scope.function_regsubst(
-		[ '130.236.254.10',
-		  '^([0-9]+)[.]([0-9]+)[.]([0-9]+)[.]([0-9]+)$',
-		  '\4-\3-\2-\1'
-		])
-	result.should(eql(&quot;10-254-236-130&quot;))
+        result = @scope.function_regsubst(
+            [ '130.236.254.10',
+              '^([0-9]+)[.]([0-9]+)[.]([0-9]+)[.]([0-9]+)$',
+              '\4-\3-\2-\1'
+            ])
+        result.should(eql(&quot;10-254-236-130&quot;))
     end
 
     it &quot;should handle simple regexps&quot; do
-	result = @scope.function_regsubst(
-		[ &quot;the monkey breaks banana trees&quot;,
-		  &quot;b[an]*a&quot;,
-		  &quot;coconut&quot;
-		])
-	result.should(eql(&quot;the monkey breaks coconut trees&quot;))
+        result = @scope.function_regsubst(
+            [ &quot;the monkey breaks banana trees&quot;,
+              &quot;b[an]*a&quot;,
+              &quot;coconut&quot;
+            ])
+        result.should(eql(&quot;the monkey breaks coconut trees&quot;))
     end
 
     it &quot;should handle case-sensitive regexps&quot; do
-	result = @scope.function_regsubst(
-		[ &quot;the monkey breaks baNAna trees&quot;,
-		  &quot;b[an]+a&quot;,
-		  &quot;coconut&quot;
-		])
-	result.should(eql(&quot;the monkey breaks baNAna trees&quot;))
+        result = @scope.function_regsubst(
+            [ &quot;the monkey breaks baNAna trees&quot;,
+              &quot;b[an]+a&quot;,
+              &quot;coconut&quot;
+            ])
+        result.should(eql(&quot;the monkey breaks baNAna trees&quot;))
     end
 
     it &quot;should handle case-insensitive regexps&quot; do
-	result = @scope.function_regsubst(
-		[ &quot;the monkey breaks baNAna trees&quot;,
-		  &quot;b[an]+a&quot;,
-		  &quot;coconut&quot;,
-		  &quot;I&quot;
-		])
-	result.should(eql(&quot;the monkey breaks coconut trees&quot;))
+        result = @scope.function_regsubst(
+            [ &quot;the monkey breaks baNAna trees&quot;,
+              &quot;b[an]+a&quot;,
+              &quot;coconut&quot;,
+              &quot;I&quot;
+            ])
+            result.should(eql(&quot;the monkey breaks coconut trees&quot;))
     end
 
     it &quot;should handle global substitutions&quot; do
-	result = @scope.function_regsubst(
-		[ &quot;the monkey breaks\tbanana trees&quot;,
-		  &quot;[ \t]&quot;,
-		  &quot;--&quot;,
-		  &quot;G&quot;
-		])
-	result.should(eql(&quot;the--monkey--breaks--banana--trees&quot;))
+        result = @scope.function_regsubst(
+            [ &quot;the monkey breaks\tbanana trees&quot;,
+              &quot;[ \t]&quot;,
+              &quot;--&quot;,
+              &quot;G&quot;
+            ])
+        result.should(eql(&quot;the--monkey--breaks--banana--trees&quot;))
     end
 
     it &quot;should handle global substitutions with groups&quot; do
-	result = @scope.function_regsubst(
-		[ '130.236.254.10',
-		  '([0-9]+)',
-		  '&lt;\1&gt;',
-		  'G'
-		])
-	result.should(eql('&lt;130&gt;.&lt;236&gt;.&lt;254&gt;.&lt;10&gt;'))
+        result = @scope.function_regsubst(
+            [ '130.236.254.10',
+              '([0-9]+)',
+              '&lt;\1&gt;',
+              'G'
+            ])
+        result.should(eql('&lt;130&gt;.&lt;236&gt;.&lt;254&gt;.&lt;10&gt;'))
     end
 
 end</diff>
      <filename>spec/unit/parser/functions/regsubst.rb</filename>
    </modified>
    <modified>
      <diff>@@ -14,29 +14,29 @@ describe &quot;the sprintf function&quot; do
 
     it &quot;should raise a ParseError if there is less than 1 argument&quot; do
         lambda { @scope.function_sprintf([]) }.should(
-		raise_error(Puppet::ParseError))
+            raise_error(Puppet::ParseError))
     end
 
     it &quot;should format integers&quot; do
-	result = @scope.function_sprintf([&quot;%+05d&quot;, &quot;23&quot;])
-	result.should(eql(&quot;+0023&quot;))
+        result = @scope.function_sprintf([&quot;%+05d&quot;, &quot;23&quot;])
+        result.should(eql(&quot;+0023&quot;))
     end
 
     it &quot;should format floats&quot; do
-	result = @scope.function_sprintf([&quot;%+.2f&quot;, &quot;2.7182818284590451&quot;])
-	result.should(eql(&quot;+2.72&quot;))
+        result = @scope.function_sprintf([&quot;%+.2f&quot;, &quot;2.7182818284590451&quot;])
+        result.should(eql(&quot;+2.72&quot;))
     end
 
     it &quot;should format large floats&quot; do
-	result = @scope.function_sprintf([&quot;%+.2e&quot;, &quot;27182818284590451&quot;])
-	result.should(eql(&quot;+2.72e+16&quot;))
+        result = @scope.function_sprintf([&quot;%+.2e&quot;, &quot;27182818284590451&quot;])
+        result.should(eql(&quot;+2.72e+16&quot;))
     end
 
     it &quot;should perform more complex formatting&quot; do
-	result = @scope.function_sprintf(
-		[ &quot;&lt;%.8s:%#5o %#8X (%-8s)&gt;&quot;,
-		  &quot;overlongstring&quot;, &quot;23&quot;, &quot;48879&quot;, &quot;foo&quot; ])
-	result.should(eql(&quot;&lt;overlong:  027   0XBEEF (foo     )&gt;&quot;))
+        result = @scope.function_sprintf(
+            [ &quot;&lt;%.8s:%#5o %#8X (%-8s)&gt;&quot;,
+              &quot;overlongstring&quot;, &quot;23&quot;, &quot;48879&quot;, &quot;foo&quot; ])
+        result.should(eql(&quot;&lt;overlong:  027   0XBEEF (foo     )&gt;&quot;))
     end
 
 end</diff>
      <filename>spec/unit/parser/functions/sprintf.rb</filename>
    </modified>
    <modified>
      <diff>@@ -162,11 +162,11 @@ describe Puppet::Parser do
 
         it &quot;should not raise errors with multiple arguments and a trailing comma&quot; do
             lambda { @parser.parse(&quot;notice(1,2,)&quot;) }.should_not raise_error
-		end
+        end
 
-	end
+    end
 
-	describe Puppet::Parser, &quot;when parsing arrays with trailing comma&quot; do
+    describe Puppet::Parser, &quot;when parsing arrays with trailing comma&quot; do
 
         it &quot;should not raise errors with a trailing comma&quot; do
             lambda { @parser.parse(&quot;$a = [1,2,]&quot;) }.should_not raise_error</diff>
      <filename>spec/unit/parser/parser.rb</filename>
    </modified>
    <modified>
      <diff>@@ -1,27 +1,27 @@
 # Basic system aliases -- these MUST be present
-MAILER-DAEMON:	postmaster
-postmaster:	root
+MAILER-DAEMON:  postmaster
+postmaster: root
 
 # General redirections for pseudo accounts
-bin:		root
-daemon:		root
-named:		root
-nobody:		root
-uucp:		root
-www:		root
-ftp-bugs:	root
-postfix:	root
+bin:        root
+daemon:     root
+named:      root
+nobody:     root
+uucp:       root
+www:        root
+ftp-bugs:   root
+postfix:    root
 
 # Put your local aliases here.
 
 # Well-known aliases
-manager:	root
-dumper:		root
-operator:	root
-abuse:		postmaster
+manager:    root
+dumper:     root
+operator:   root
+abuse:      postmaster
 
 # trap decode to catch security attacks
-decode:		root
+decode:     root
 
 # Other tests
 anothertest: &quot;|/path/to/rt-mailgate --queue 'another test' --action correspond --url http://my.com/&quot;</diff>
      <filename>test/data/providers/mailalias/aliases/test1</filename>
    </modified>
    <modified>
      <diff>@@ -1,11 +1,11 @@
 $var=['/tmp/file1','/tmp/file2']
 
 class arraytest {
-	$var += ['/tmp/file3', '/tmp/file4']
-	file {
-		$var:
-			content =&gt; &quot;test&quot;
-	}
+    $var += ['/tmp/file3', '/tmp/file4']
+    file {
+        $var:
+            content =&gt; &quot;test&quot;
+    }
 }
 
 include arraytest</diff>
      <filename>test/data/snippets/append.pp</filename>
    </modified>
    <modified>
      <diff>@@ -1,6 +1,6 @@
 
 /*
 file {
-    &quot;/tmp/multilinecomments&quot;: content =&gt; &quot;pouet&quot;	
+    &quot;/tmp/multilinecomments&quot;: content =&gt; &quot;pouet&quot;
 }
 */</diff>
      <filename>test/data/snippets/multilinecomments.pp</filename>
    </modified>
    <modified>
      <diff>@@ -1,6 +1,6 @@
-127.0.0.1		localhost
-192.168.0.3		culain.madstop.com	culain
-192.168.0.100		yaytest
+127.0.0.1               localhost
+192.168.0.3             culain.madstop.com      culain
+192.168.0.100           yaytest
 
 # The following lines are desirable for IPv6 capable hosts
 # (added automatically by netbase upgrade)</diff>
      <filename>test/data/types/hosts/2</filename>
    </modified>
    <modified>
      <diff>@@ -1,5 +1,5 @@
 #
 # Internet host table
 #
-127.0.0.1	localhost
-192.168.0.50	sol10b
+127.0.0.1       localhost
+192.168.0.50    sol10b</diff>
      <filename>test/data/types/hosts/solaris</filename>
    </modified>
    <modified>
      <diff>@@ -1,7 +1,7 @@
-# Device		Mountpoint	FStype	Options		Dump	Pass#
-/dev/ad0s1b		none		swap	sw		0	0
-/dev/ad0s1a		/		ufs	rw		1	1
-/dev/ad0s1e		/tmp		ufs	rw		2	2
-/dev/ad0s1f		/usr		ufs	rw		2	2
-/dev/ad0s1d		/var		ufs	rw		2	2
-/dev/acd0		/cdrom		cd9660	ro,noauto	0	0
+# Device                Mountpoint      FStype  Options         Dump    Pass#
+/dev/ad0s1b             none            swap    sw              0       0
+/dev/ad0s1a             /               ufs     rw              1       1
+/dev/ad0s1e             /tmp            ufs     rw              2       2
+/dev/ad0s1f             /usr            ufs     rw              2       2
+/dev/ad0s1d             /var            ufs     rw              2       2
+/dev/acd0               /cdrom          cd9660  ro,noauto       0       0</diff>
      <filename>test/data/types/mount/freebsd.fstab</filename>
    </modified>
    <modified>
      <diff>@@ -1,11 +1,11 @@
-#device		device		mount		FS	fsck	mount	mount
-#to mount	to fsck		point		type	pass	at boot	options
+#device         device          mount           FS      fsck    mount   mount
+#to mount       to fsck         point           type    pass    at boot options
 #
-fd	-	/dev/fd	fd	-	no	-
-/proc	-	/proc	proc	-	no	-
-/dev/dsk/c0d0s0	/dev/rdsk/c0d0s0	/	ufs	1	no	-
-/dev/dsk/c0d0p0:boot	-	/boot	pcfs	-	no	-
-/devices	-	/devices	devfs	-	no	-
-ctfs	-	/system/contract	ctfs	-	no	-
-objfs	-	/system/object	objfs	-	no	-
-#swap	-	/tmp	tmpfs	-	yes	-
+fd      -       /dev/fd fd      -       no      -
+/proc   -       /proc   proc    -       no      -
+/dev/dsk/c0d0s0 /dev/rdsk/c0d0s0        /       ufs     1       no      -
+/dev/dsk/c0d0p0:boot    -       /boot   pcfs    -       no      -
+/devices        -       /devices        devfs   -       no      -
+ctfs    -       /system/contract        ctfs    -       no      -
+objfs   -       /system/object  objfs   -       no      -
+#swap   -       /tmp    tmpfs   -       yes     -</diff>
      <filename>test/data/types/mount/solaris.fstab</filename>
    </modified>
    <modified>
      <diff>@@ -10,219 +10,219 @@
 # by IANA and used in the real-world or are needed by a debian package.
 # If you need a huge list of used numbers please install the nmap package.
 
-tcpmux		1/tcp				# TCP port service multiplexer
-echo		7/tcp
-echo		7/udp
-discard		9/tcp		sink null
-discard		9/udp		sink null
-systat		11/tcp		users
-daytime		13/tcp
-daytime		13/udp
-netstat		15/tcp
-qotd		17/tcp		quote
-msp		18/tcp				# message send protocol
-msp		18/udp
-chargen		19/tcp		ttytst source
-chargen		19/udp		ttytst source
-ftp-data	20/tcp
-ftp		21/tcp
-fsp		21/udp		fspd
-ssh		22/tcp				# SSH Remote Login Protocol
-ssh		22/udp
-telnet		23/tcp
-smtp		25/tcp		mail
-time		37/tcp		timserver
-time		37/udp		timserver
-rlp		39/udp		resource	# resource location
-nameserver	42/tcp		name		# IEN 116
-whois		43/tcp		nicname
-tacacs		49/tcp				# Login Host Protocol (TACACS)
-tacacs		49/udp
-re-mail-ck	50/tcp				# Remote Mail Checking Protocol
-re-mail-ck	50/udp
-domain		53/tcp		nameserver	# name-domain server
-domain		53/udp		nameserver
-mtp		57/tcp				# deprecated
-tacacs-ds	65/tcp				# TACACS-Database Service
-tacacs-ds	65/udp
-bootps		67/tcp				# BOOTP server
-bootps		67/udp
-bootpc		68/tcp				# BOOTP client
-bootpc		68/udp
-tftp		69/udp
-gopher		70/tcp				# Internet Gopher
-gopher		70/udp
-rje		77/tcp		netrjs
-finger		79/tcp
-www		80/tcp		http		# WorldWideWeb HTTP
-www		80/udp				# HyperText Transfer Protocol
-link		87/tcp		ttylink
-kerberos	88/tcp		kerberos5 krb5 kerberos-sec	# Kerberos v5
-kerberos	88/udp		kerberos5 krb5 kerberos-sec	# Kerberos v5
-supdup		95/tcp
-hostnames	101/tcp		hostname	# usually from sri-nic
-iso-tsap	102/tcp		tsap		# part of ISODE
-acr-nema	104/tcp		dicom		# Digital Imag. &amp; Comm. 300
-acr-nema	104/udp		dicom		# Digital Imag. &amp; Comm. 300
-csnet-ns	105/tcp		cso-ns		# also used by CSO name server
-csnet-ns	105/udp		cso-ns
-rtelnet		107/tcp				# Remote Telnet
-rtelnet		107/udp
-pop2		109/tcp		postoffice pop-2 # POP version 2
-pop2		109/udp		pop-2
-pop3		110/tcp		pop-3		# POP version 3
-pop3		110/udp		pop-3
-sunrpc		111/tcp		portmapper	# RPC 4.0 portmapper
-sunrpc		111/udp		portmapper
-auth		113/tcp		authentication tap ident
-sftp		115/tcp
-uucp-path	117/tcp
-nntp		119/tcp		readnews untp	# USENET News Transfer Protocol
-ntp		123/tcp
-ntp		123/udp				# Network Time Protocol
-pwdgen		129/tcp				# PWDGEN service
-pwdgen		129/udp				# PWDGEN service
-loc-srv		135/tcp		epmap		# Location Service
-loc-srv		135/udp		epmap
-netbios-ns	137/tcp				# NETBIOS Name Service
-netbios-ns	137/udp
-netbios-dgm	138/tcp				# NETBIOS Datagram Service
-netbios-dgm	138/udp
-netbios-ssn	139/tcp				# NETBIOS session service
-netbios-ssn	139/udp
-imap2		143/tcp		imap		# Interim Mail Access P 2 and 4
-imap2		143/udp		imap
-snmp		161/tcp				# Simple Net Mgmt Protocol
-snmp		161/udp				# Simple Net Mgmt Protocol
-snmp-trap	162/tcp		snmptrap	# Traps for SNMP
-snmp-trap	162/udp		snmptrap	# Traps for SNMP
-cmip-man	163/tcp				# ISO mgmt over IP (CMOT)
-cmip-man	163/udp
-cmip-agent	164/tcp
-cmip-agent	164/udp
-mailq		174/tcp			# Mailer transport queue for Zmailer
-mailq		174/udp			# Mailer transport queue for Zmailer
-xdmcp		177/tcp				# X Display Mgr. Control Proto
-xdmcp		177/udp
-nextstep	178/tcp		NeXTStep NextStep	# NeXTStep window
-nextstep	178/udp		NeXTStep NextStep	#  server
-bgp		179/tcp				# Border Gateway Protocol
-bgp		179/udp
-prospero	191/tcp				# Cliff Neuman's Prospero
-prospero	191/udp
-irc		194/tcp				# Internet Relay Chat
-irc		194/udp
-smux		199/tcp				# SNMP Unix Multiplexer
-smux		199/udp
-at-rtmp		201/tcp				# AppleTalk routing
-at-rtmp		201/udp
-at-nbp		202/tcp				# AppleTalk name binding
-at-nbp		202/udp
-at-echo		204/tcp				# AppleTalk echo
-at-echo		204/udp
-at-zis		206/tcp				# AppleTalk zone information
-at-zis		206/udp
-qmtp		209/tcp				# Quick Mail Transfer Protocol
-qmtp		209/udp				# Quick Mail Transfer Protocol
-z3950		210/tcp		wais		# NISO Z39.50 database
-z3950		210/udp		wais
-ipx		213/tcp				# IPX
-ipx		213/udp
-imap3		220/tcp				# Interactive Mail Access
-imap3		220/udp				# Protocol v3
-pawserv		345/tcp				# Perf Analysis Workbench
-pawserv		345/udp
-zserv		346/tcp				# Zebra server
-zserv		346/udp
-fatserv		347/tcp				# Fatmen Server
-fatserv		347/udp
-rpc2portmap	369/tcp
-rpc2portmap	369/udp				# Coda portmapper
-codaauth2	370/tcp
-codaauth2	370/udp				# Coda authentication server
-clearcase	371/tcp		Clearcase
-clearcase	371/udp		Clearcase
-ulistserv	372/tcp				# UNIX Listserv
-ulistserv	372/udp
-ldap		389/tcp			# Lightweight Directory Access Protocol
-ldap		389/udp
-imsp		406/tcp			# Interactive Mail Support Protocol
-imsp		406/udp
-https		443/tcp				# http protocol over TLS/SSL
-https		443/udp
-snpp		444/tcp				# Simple Network Paging Protocol
-snpp		444/udp
-microsoft-ds	445/tcp				# Microsoft Naked CIFS
-microsoft-ds	445/udp
-saft		487/tcp			# Simple Asynchronous File Transfer
-saft		487/udp
-isakmp		500/tcp			# IPsec - Internet Security Association
-isakmp		500/udp			#  and Key Management Protocol
-rtsp		554/tcp			# Real Time Stream Control Protocol
-rtsp		554/udp			# Real Time Stream Control Protocol
-nqs		607/tcp				# Network Queuing system
-nqs		607/udp
-npmp-local	610/tcp		dqs313_qmaster		# npmp-local / DQS
-npmp-local	610/udp		dqs313_qmaster
-npmp-gui	611/tcp		dqs313_execd		# npmp-gui / DQS
-npmp-gui	611/udp		dqs313_execd
-hmmp-ind	612/tcp		dqs313_intercell	# HMMP Indication / DQS
-hmmp-ind	612/udp		dqs313_intercell
-ipp		631/tcp				# Internet Printing Protocol
-ipp		631/udp
+tcpmux          1/tcp                           # TCP port service multiplexer
+echo            7/tcp
+echo            7/udp
+discard         9/tcp           sink null
+discard         9/udp           sink null
+systat          11/tcp          users
+daytime         13/tcp
+daytime         13/udp
+netstat         15/tcp
+qotd            17/tcp          quote
+msp             18/tcp                          # message send protocol
+msp             18/udp
+chargen         19/tcp          ttytst source
+chargen         19/udp          ttytst source
+ftp-data        20/tcp
+ftp             21/tcp
+fsp             21/udp          fspd
+ssh             22/tcp                          # SSH Remote Login Protocol
+ssh             22/udp
+telnet          23/tcp
+smtp            25/tcp          mail
+time            37/tcp          timserver
+time            37/udp          timserver
+rlp             39/udp          resource        # resource location
+nameserver      42/tcp          name            # IEN 116
+whois           43/tcp          nicname
+tacacs          49/tcp                          # Login Host Protocol (TACACS)
+tacacs          49/udp
+re-mail-ck      50/tcp                          # Remote Mail Checking Protocol
+re-mail-ck      50/udp
+domain          53/tcp          nameserver      # name-domain server
+domain          53/udp          nameserver
+mtp             57/tcp                          # deprecated
+tacacs-ds       65/tcp                          # TACACS-Database Service
+tacacs-ds       65/udp
+bootps          67/tcp                          # BOOTP server
+bootps          67/udp
+bootpc          68/tcp                          # BOOTP client
+bootpc          68/udp
+tftp            69/udp
+gopher          70/tcp                          # Internet Gopher
+gopher          70/udp
+rje             77/tcp          netrjs
+finger          79/tcp
+www             80/tcp          http            # WorldWideWeb HTTP
+www             80/udp                          # HyperText Transfer Protocol
+link            87/tcp          ttylink
+kerberos        88/tcp          kerberos5 krb5 kerberos-sec     # Kerberos v5
+kerberos        88/udp          kerberos5 krb5 kerberos-sec     # Kerberos v5
+supdup          95/tcp
+hostnames       101/tcp         hostname        # usually from sri-nic
+iso-tsap        102/tcp         tsap            # part of ISODE
+acr-nema        104/tcp         dicom           # Digital Imag. &amp; Comm. 300
+acr-nema        104/udp         dicom           # Digital Imag. &amp; Comm. 300
+csnet-ns        105/tcp         cso-ns          # also used by CSO name server
+csnet-ns        105/udp         cso-ns
+rtelnet         107/tcp                         # Remote Telnet
+rtelnet         107/udp
+pop2            109/tcp         postoffice pop-2 # POP version 2
+pop2            109/udp         pop-2
+pop3            110/tcp         pop-3           # POP version 3
+pop3            110/udp         pop-3
+sunrpc          111/tcp         portmapper      # RPC 4.0 portmapper
+sunrpc          111/udp         portmapper
+auth            113/tcp         authentication tap ident
+sftp            115/tcp
+uucp-path       117/tcp
+nntp            119/tcp         readnews untp   # USENET News Transfer Protocol
+ntp             123/tcp
+ntp             123/udp                         # Network Time Protocol
+pwdgen          129/tcp                         # PWDGEN service
+pwdgen          129/udp                         # PWDGEN service
+loc-srv         135/tcp         epmap           # Location Service
+loc-srv         135/udp         epmap
+netbios-ns      137/tcp                         # NETBIOS Name Service
+netbios-ns      137/udp
+netbios-dgm     138/tcp                         # NETBIOS Datagram Service
+netbios-dgm     138/udp
+netbios-ssn     139/tcp                         # NETBIOS session service
+netbios-ssn     139/udp
+imap2           143/tcp         imap            # Interim Mail Access P 2 and 4
+imap2           143/udp         imap
+snmp            161/tcp                         # Simple Net Mgmt Protocol
+snmp            161/udp                         # Simple Net Mgmt Protocol
+snmp-trap       162/tcp         snmptrap        # Traps for SNMP
+snmp-trap       162/udp         snmptrap        # Traps for SNMP
+cmip-man        163/tcp                         # ISO mgmt over IP (CMOT)
+cmip-man        163/udp
+cmip-agent      164/tcp
+cmip-agent      164/udp
+mailq           174/tcp                 # Mailer transport queue for Zmailer
+mailq           174/udp                 # Mailer transport queue for Zmailer
+xdmcp           177/tcp                         # X Display Mgr. Control Proto
+xdmcp           177/udp
+nextstep        178/tcp         NeXTStep NextStep       # NeXTStep window
+nextstep        178/udp         NeXTStep NextStep       #  server
+bgp             179/tcp                         # Border Gateway Protocol
+bgp             179/udp
+prospero        191/tcp                         # Cliff Neuman's Prospero
+prospero        191/udp
+irc             194/tcp                         # Internet Relay Chat
+irc             194/udp
+smux            199/tcp                         # SNMP Unix Multiplexer
+smux            199/udp
+at-rtmp         201/tcp                         # AppleTalk routing
+at-rtmp         201/udp
+at-nbp          202/tcp                         # AppleTalk name binding
+at-nbp          202/udp
+at-echo         204/tcp                         # AppleTalk echo
+at-echo         204/udp
+at-zis          206/tcp                         # AppleTalk zone information
+at-zis          206/udp
+qmtp            209/tcp                         # Quick Mail Transfer Protocol
+qmtp            209/udp                         # Quick Mail Transfer Protocol
+z3950           210/tcp         wais            # NISO Z39.50 database
+z3950           210/udp         wais
+ipx             213/tcp                         # IPX
+ipx             213/udp
+imap3           220/tcp                         # Interactive Mail Access
+imap3           220/udp                         # Protocol v3
+pawserv         345/tcp                         # Perf Analysis Workbench
+pawserv         345/udp
+zserv           346/tcp                         # Zebra server
+zserv           346/udp
+fatserv         347/tcp                         # Fatmen Server
+fatserv         347/udp
+rpc2portmap     369/tcp
+rpc2portmap     369/udp                         # Coda portmapper
+codaauth2       370/tcp
+codaauth2       370/udp                         # Coda authentication server
+clearcase       371/tcp         Clearcase
+clearcase       371/udp         Clearcase
+ulistserv       372/tcp                         # UNIX Listserv
+ulistserv       372/udp
+ldap            389/tcp                 # Lightweight Directory Access Protocol
+ldap            389/udp
+imsp            406/tcp                 # Interactive Mail Support Protocol
+imsp            406/udp
+https           443/tcp                         # http protocol over TLS/SSL
+https           443/udp
+snpp            444/tcp                         # Simple Network Paging Protocol
+snpp            444/udp
+microsoft-ds    445/tcp                         # Microsoft Naked CIFS
+microsoft-ds    445/udp
+saft            487/tcp                 # Simple Asynchronous File Transfer
+saft            487/udp
+isakmp          500/tcp                 # IPsec - Internet Security Association
+isakmp          500/udp                 #  and Key Management Protocol
+rtsp            554/tcp                 # Real Time Stream Control Protocol
+rtsp            554/udp                 # Real Time Stream Control Protocol
+nqs             607/tcp                         # Network Queuing system
+nqs             607/udp
+npmp-local      610/tcp         dqs313_qmaster          # npmp-local / DQS
+npmp-local      610/udp         dqs313_qmaster
+npmp-gui        611/tcp         dqs313_execd            # npmp-gui / DQS
+npmp-gui        611/udp         dqs313_execd
+hmmp-ind        612/tcp         dqs313_intercell        # HMMP Indication / DQS
+hmmp-ind        612/udp         dqs313_intercell
+ipp             631/tcp                         # Internet Printing Protocol
+ipp             631/udp
 #
 # UNIX specific services
 #
-exec		512/tcp
-biff		512/udp		comsat
-login		513/tcp
-who		513/udp		whod
-shell		514/tcp		cmd		# no passwords used
-syslog		514/udp
-printer		515/tcp		spooler		# line printer spooler
-talk		517/udp
-ntalk		518/udp
-route		520/udp		router routed	# RIP
-timed		525/udp		timeserver
-tempo		526/tcp		newdate
-courier		530/tcp		rpc
-conference	531/tcp		chat
-netnews		532/tcp		readnews
-netwall		533/udp				# for emergency broadcasts
-gdomap		538/tcp				# GNUstep distributed objects
-gdomap		538/udp
-uucp		540/tcp		uucpd		# uucp daemon
-klogin		543/tcp				# Kerberized `rlogin' (v5)
-kshell		544/tcp		krcmd		# Kerberized `rsh' (v5)
-afpovertcp	548/tcp				# AFP over TCP
-afpovertcp	548/udp
-remotefs	556/tcp		rfs_server rfs	# Brunhoff remote filesystem
-nntps		563/tcp		snntp		# NNTP over SSL
-nntps		563/udp		snntp
-submission	587/tcp				# Submission [RFC2476]
-submission	587/udp
-ldaps		636/tcp				# LDAP over SSL
-ldaps		636/udp
-tinc		655/tcp				# tinc control port
-tinc		655/udp
-silc		706/tcp
-silc		706/udp
-kerberos-adm	749/tcp				# Kerberos `kadmin' (v5)
+exec            512/tcp
+biff            512/udp         comsat
+login           513/tcp
+who             513/udp         whod
+shell           514/tcp         cmd             # no passwords used
+syslog          514/udp
+printer         515/tcp         spooler         # line printer spooler
+talk            517/udp
+ntalk           518/udp
+route           520/udp         router routed   # RIP
+timed           525/udp         timeserver
+tempo           526/tcp         newdate
+courier         530/tcp         rpc
+conference      531/tcp         chat
+netnews         532/tcp         readnews
+netwall         533/udp                         # for emergency broadcasts
+gdomap          538/tcp                         # GNUstep distributed objects
+gdomap          538/udp
+uucp            540/tcp         uucpd           # uucp daemon
+klogin          543/tcp                         # Kerberized `rlogin' (v5)
+kshell          544/tcp         krcmd           # Kerberized `rsh' (v5)
+afpovertcp      548/tcp                         # AFP over TCP
+afpovertcp      548/udp
+remotefs        556/tcp         rfs_server rfs  # Brunhoff remote filesystem
+nntps           563/tcp         snntp           # NNTP over SSL
+nntps           563/udp         snntp
+submission      587/tcp                         # Submission [RFC2476]
+submission      587/udp
+ldaps           636/tcp                         # LDAP over SSL
+ldaps           636/udp
+tinc            655/tcp                         # tinc control port
+tinc            655/udp
+silc            706/tcp
+silc            706/udp
+kerberos-adm    749/tcp                         # Kerberos `kadmin' (v5)
 #
-webster		765/tcp				# Network dictionary
-webster		765/udp
-rsync		873/tcp
-rsync		873/udp
-ftps-data	989/tcp				# FTP over SSL (data)
-ftps		990/tcp
-telnets		992/tcp				# Telnet over SSL
-telnets		992/udp
-imaps		993/tcp				# IMAP over SSL
-imaps		993/udp
-ircs		994/tcp				# IRC over SSL
-ircs		994/udp
-pop3s		995/tcp				# POP-3 over SSL
-pop3s		995/udp
+webster         765/tcp                         # Network dictionary
+webster         765/udp
+rsync           873/tcp
+rsync           873/udp
+ftps-data       989/tcp                         # FTP over SSL (data)
+ftps            990/tcp
+telnets         992/tcp                         # Telnet over SSL
+telnets         992/udp
+imaps           993/tcp                         # IMAP over SSL
+imaps           993/udp
+ircs            994/tcp                         # IRC over SSL
+ircs            994/udp
+pop3s           995/tcp                         # POP-3 over SSL
+pop3s           995/udp
 #
 # From ``Assigned Numbers'':
 #
@@ -238,169 +238,169 @@ pop3s		995/udp
 #&gt; does register or list uses of these ports as a convienence to the
 #&gt; community.
 #
-socks		1080/tcp			# socks proxy server
-socks		1080/udp
-proofd		1093/tcp
-proofd		1093/udp
-rootd		1094/tcp
-rootd		1094/udp
-openvpn		1194/tcp
-openvpn		1194/udp
-rmiregistry	1099/tcp			# Java RMI Registry
-rmiregistry	1099/udp
-kazaa		1214/tcp
-kazaa		1214/udp
-nessus		1241/tcp			# Nessus vulnerability
-nessus		1241/udp			#  assessment scanner
-lotusnote	1352/tcp	lotusnotes	# Lotus Note
-lotusnote	1352/udp	lotusnotes
-ms-sql-s	1433/tcp			# Microsoft SQL Server
-ms-sql-s	1433/udp
-ms-sql-m	1434/tcp			# Microsoft SQL Monitor
-ms-sql-m	1434/udp
-ingreslock	1524/tcp
-ingreslock	1524/udp
-prospero-np	1525/tcp			# Prospero non-privileged
-prospero-np	1525/udp
-datametrics	1645/tcp	old-radius
-datametrics	1645/udp	old-radius
-sa-msg-port	1646/tcp	old-radacct
-sa-msg-port	1646/udp	old-radacct
-kermit		1649/tcp
-kermit		1649/udp
-l2f		1701/tcp	l2tp
-l2f		1701/udp	l2tp
-radius		1812/tcp
-radius		1812/udp
-radius-acct	1813/tcp	radacct		# Radius Accounting
-radius-acct	1813/udp	radacct
-unix-status	1957/tcp			# remstats unix-status server
-log-server	1958/tcp			# remstats log server
-remoteping	1959/tcp			# remstats remoteping server
-rtcm-sc104	2101/tcp			# RTCM SC-104 IANA 1/29/99
-rtcm-sc104	2101/udp
-cvspserver	2401/tcp			# CVS client/server operations
-cvspserver	2401/udp
-venus		2430/tcp			# codacon port
-venus		2430/udp			# Venus callback/wbc interface
-venus-se	2431/tcp			# tcp side effects
-venus-se	2431/udp			# udp sftp side effect
-codasrv		2432/tcp			# not used
-codasrv		2432/udp			# server port
-codasrv-se	2433/tcp			# tcp side effects
-codasrv-se	2433/udp			# udp sftp side effect
-mon		2583/tcp			# MON
-mon		2583/udp
-dict		2628/tcp			# Dictionary server
-dict		2628/udp
-gpsd		2947/tcp
-gpsd		2947/udp
-gds_db		3050/tcp			# InterBase server
-gds_db		3050/udp
-icpv2		3130/tcp	icp		# Internet Cache Protocol
-icpv2		3130/udp	icp
-mysql		3306/tcp
-mysql		3306/udp
-nut		3493/tcp			# Network UPS Tools
-nut		3493/udp
-distcc		3632/tcp			# distributed compiler
-distcc		3632/udp
-daap		3689/tcp			# Digital Audio Access Protocol
-daap		3689/udp
-svn		3690/tcp	subversion	# Subversion protocol
-svn		3690/udp	subversion
-iax		4569/tcp			# Inter-Asterisk eXchange
-iax		4569/udp
-radmin-port	4899/tcp			# RAdmin Port
-radmin-port	4899/udp
-rfe		5002/udp			# Radio Free Ethernet
-rfe		5002/tcp
-sip		5060/tcp			# Session Initiation Protocol
-sip		5060/udp
-sip-tls		5061/tcp
-sip-tls		5061/udp
-xmpp-client	5222/tcp	jabber-client	# Jabber Client Connection
-xmpp-client	5222/udp	jabber-client
-xmpp-server	5269/tcp	jabber-server	# Jabber Server Connection
-xmpp-server	5269/udp	jabber-server
-cfengine	5308/tcp
-cfengine	5308/udp
-postgresql	5432/tcp	postgres	# PostgreSQL Database
-postgresql	5432/udp	postgres
-x11		6000/tcp	x11-0		# X Window System
-x11		6000/udp	x11-0
-x11-1		6001/tcp
-x11-1		6001/udp
-x11-2		6002/tcp
-x11-2		6002/udp
-x11-3		6003/tcp
-x11-3		6003/udp
-x11-4		6004/tcp
-x11-4		6004/udp
-x11-5		6005/tcp
-x11-5		6005/udp
-x11-6		6006/tcp
-x11-6		6006/udp
-x11-7		6007/tcp
-x11-7		6007/udp
-gnutella-svc	6346/tcp			# gnutella
-gnutella-svc	6346/udp
-gnutella-rtr	6347/tcp			# gnutella 
-gnutella-rtr	6347/udp
-afs3-fileserver 7000/tcp	bbs		# file server itself
-afs3-fileserver 7000/udp	bbs
-afs3-callback	7001/tcp			# callbacks to cache managers
-afs3-callback	7001/udp
-afs3-prserver	7002/tcp			# users &amp; groups database
-afs3-prserver	7002/udp
-afs3-vlserver	7003/tcp			# volume location database
-afs3-vlserver	7003/udp
-afs3-kaserver	7004/tcp			# AFS/Kerberos authentication
-afs3-kaserver	7004/udp
-afs3-volser	7005/tcp			# volume managment server
-afs3-volser	7005/udp
-afs3-errors	7006/tcp			# error interpretation service
-afs3-errors	7006/udp
-afs3-bos	7007/tcp			# basic overseer process
-afs3-bos	7007/udp
-afs3-update	7008/tcp			# server-to-server updater
-afs3-update	7008/udp
-afs3-rmtsys	7009/tcp			# remote cache manager service
-afs3-rmtsys	7009/udp
-font-service	7100/tcp	xfs		# X Font Service
-font-service	7100/udp	xfs
-bacula-dir	9101/tcp			# Bacula Director
-bacula-dir	9101/udp
-bacula-fd	9102/tcp			# Bacula File Daemon
-bacula-fd	9102/udp
-bacula-sd	9103/tcp			# Bacula Storage Daemon
-bacula-sd	9103/udp
-amanda		10080/tcp			# amanda backup services
-amanda		10080/udp
-hkp		11371/tcp			# OpenPGP HTTP Keyserver
-hkp		11371/udp			# OpenPGP HTTP Keyserver
-bprd            13720/tcp			# VERITAS NetBackup
+socks           1080/tcp                        # socks proxy server
+socks           1080/udp
+proofd          1093/tcp
+proofd          1093/udp
+rootd           1094/tcp
+rootd           1094/udp
+openvpn         1194/tcp
+openvpn         1194/udp
+rmiregistry     1099/tcp                        # Java RMI Registry
+rmiregistry     1099/udp
+kazaa           1214/tcp
+kazaa           1214/udp
+nessus          1241/tcp                        # Nessus vulnerability
+nessus          1241/udp                        #  assessment scanner
+lotusnote       1352/tcp        lotusnotes      # Lotus Note
+lotusnote       1352/udp        lotusnotes
+ms-sql-s        1433/tcp                        # Microsoft SQL Server
+ms-sql-s        1433/udp
+ms-sql-m        1434/tcp                        # Microsoft SQL Monitor
+ms-sql-m        1434/udp
+ingreslock      1524/tcp
+ingreslock      1524/udp
+prospero-np     1525/tcp                        # Prospero non-privileged
+prospero-np     1525/udp
+datametrics     1645/tcp        old-radius
+datametrics     1645/udp        old-radius
+sa-msg-port     1646/tcp        old-radacct
+sa-msg-port     1646/udp        old-radacct
+kermit          1649/tcp
+kermit          1649/udp
+l2f             1701/tcp        l2tp
+l2f             1701/udp        l2tp
+radius          1812/tcp
+radius          1812/udp
+radius-acct     1813/tcp        radacct         # Radius Accounting
+radius-acct     1813/udp        radacct
+unix-status     1957/tcp                        # remstats unix-status server
+log-server      1958/tcp                        # remstats log server
+remoteping      1959/tcp                        # remstats remoteping server
+rtcm-sc104      2101/tcp                        # RTCM SC-104 IANA 1/29/99
+rtcm-sc104      2101/udp
+cvspserver      2401/tcp                        # CVS client/server operations
+cvspserver      2401/udp
+venus           2430/tcp                        # codacon port
+venus           2430/udp                        # Venus callback/wbc interface
+venus-se        2431/tcp                        # tcp side effects
+venus-se        2431/udp                        # udp sftp side effect
+codasrv         2432/tcp                        # not used
+codasrv         2432/udp                        # server port
+codasrv-se      2433/tcp                        # tcp side effects
+codasrv-se      2433/udp                        # udp sftp side effect
+mon             2583/tcp                        # MON
+mon             2583/udp
+dict            2628/tcp                        # Dictionary server
+dict            2628/udp
+gpsd            2947/tcp
+gpsd            2947/udp
+gds_db          3050/tcp                        # InterBase server
+gds_db          3050/udp
+icpv2           3130/tcp        icp             # Internet Cache Protocol
+icpv2           3130/udp        icp
+mysql           3306/tcp
+mysql           3306/udp
+nut             3493/tcp                        # Network UPS Tools
+nut             3493/udp
+distcc          3632/tcp                        # distributed compiler
+distcc          3632/udp
+daap            3689/tcp                        # Digital Audio Access Protocol
+daap            3689/udp
+svn             3690/tcp        subversion      # Subversion protocol
+svn             3690/udp        subversion
+iax             4569/tcp                        # Inter-Asterisk eXchange
+iax             4569/udp
+radmin-port     4899/tcp                        # RAdmin Port
+radmin-port     4899/udp
+rfe             5002/udp                        # Radio Free Ethernet
+rfe             5002/tcp
+sip             5060/tcp                        # Session Initiation Protocol
+sip             5060/udp
+sip-tls         5061/tcp
+sip-tls         5061/udp
+xmpp-client     5222/tcp        jabber-client   # Jabber Client Connection
+xmpp-client     5222/udp        jabber-client
+xmpp-server     5269/tcp        jabber-server   # Jabber Server Connection
+xmpp-server     5269/udp        jabber-server
+cfengine        5308/tcp
+cfengine        5308/udp
+postgresql      5432/tcp        postgres        # PostgreSQL Database
+postgresql      5432/udp        postgres
+x11             6000/tcp        x11-0           # X Window System
+x11             6000/udp        x11-0
+x11-1           6001/tcp
+x11-1           6001/udp
+x11-2           6002/tcp
+x11-2           6002/udp
+x11-3           6003/tcp
+x11-3           6003/udp
+x11-4           6004/tcp
+x11-4           6004/udp
+x11-5           6005/tcp
+x11-5           6005/udp
+x11-6           6006/tcp
+x11-6           6006/udp
+x11-7           6007/tcp
+x11-7           6007/udp
+gnutella-svc    6346/tcp                        # gnutella
+gnutella-svc    6346/udp
+gnutella-rtr    6347/tcp                        # gnutella
+gnutella-rtr    6347/udp
+afs3-fileserver 7000/tcp        bbs             # file server itself
+afs3-fileserver 7000/udp        bbs
+afs3-callback   7001/tcp                        # callbacks to cache managers
+afs3-callback   7001/udp
+afs3-prserver   7002/tcp                        # users &amp; groups database
+afs3-prserver   7002/udp
+afs3-vlserver   7003/tcp                        # volume location database
+afs3-vlserver   7003/udp
+afs3-kaserver   7004/tcp                        # AFS/Kerberos authentication
+afs3-kaserver   7004/udp
+afs3-volser     7005/tcp                        # volume managment server
+afs3-volser     7005/udp
+afs3-errors     7006/tcp                        # error interpretation service
+afs3-errors     7006/udp
+afs3-bos        7007/tcp                        # basic overseer process
+afs3-bos        7007/udp
+afs3-update     7008/tcp                        # server-to-server updater
+afs3-update     7008/udp
+afs3-rmtsys     7009/tcp                        # remote cache manager service
+afs3-rmtsys     7009/udp
+font-service    7100/tcp        xfs             # X Font Service
+font-service    7100/udp        xfs
+bacula-dir      9101/tcp                        # Bacula Director
+bacula-dir      9101/udp
+bacula-fd       9102/tcp                        # Bacula File Daemon
+bacula-fd       9102/udp
+bacula-sd       9103/tcp                        # Bacula Storage Daemon
+bacula-sd       9103/udp
+amanda          10080/tcp                       # amanda backup services
+amanda          10080/udp
+hkp             11371/tcp                       # OpenPGP HTTP Keyserver
+hkp             11371/udp                       # OpenPGP HTTP Keyserver
+bprd            13720/tcp                       # VERITAS NetBackup
 bprd            13720/udp
-bpdbm           13721/tcp			# VERITAS NetBackup
+bpdbm           13721/tcp                       # VERITAS NetBackup
 bpdbm           13721/udp
-bpjava-msvc     13722/tcp			# BP Java MSVC Protocol
+bpjava-msvc     13722/tcp                       # BP Java MSVC Protocol
 bpjava-msvc     13722/udp
-vnetd           13724/tcp			# Veritas Network Utility
+vnetd           13724/tcp                       # Veritas Network Utility
 vnetd           13724/udp
-bpcd            13782/tcp			# VERITAS NetBackup
+bpcd            13782/tcp                       # VERITAS NetBackup
 bpcd            13782/udp
-vopied          13783/tcp			# VERITAS NetBackup
+vopied          13783/tcp                       # VERITAS NetBackup
 vopied          13783/udp
-wnn6		22273/tcp			# wnn6
-wnn6		22273/udp
+wnn6            22273/tcp                       # wnn6
+wnn6            22273/udp
 
 #
 # Datagram Delivery Protocol services
 #
-rtmp		1/ddp			# Routing Table Maintenance Protocol
-nbp		2/ddp			# Name Binding Protocol
-echo		4/ddp			# AppleTalk Echo Protocol
-zip		6/ddp			# Zone Information Protocol
+rtmp            1/ddp                   # Routing Table Maintenance Protocol
+nbp             2/ddp                   # Name Binding Protocol
+echo            4/ddp                   # AppleTalk Echo Protocol
+zip             6/ddp                   # Zone Information Protocol
 
 #=========================================================================
 # The remaining port numbers are not as allocated by IANA.
@@ -410,124 +410,124 @@ zip		6/ddp			# Zone Information Protocol
 # Note that these are for Kerberos v4, and are unofficial.  Sites running
 # v4 should uncomment these and comment out the v5 entries above.
 #
-kerberos4	750/udp		kerberos-iv kdc	# Kerberos (server)
-kerberos4	750/tcp		kerberos-iv kdc
-kerberos_master	751/udp				# Kerberos authentication
-kerberos_master	751/tcp	
-passwd_server	752/udp				# Kerberos passwd server
-krb_prop	754/tcp		krb5_prop hprop	# Kerberos slave propagation
-krbupdate	760/tcp		kreg		# Kerberos registration
-kpasswd		761/tcp		kpwd		# Kerberos &quot;passwd&quot;
-swat		901/tcp				# swat
-kpop		1109/tcp			# Pop with Kerberos
-knetd		2053/tcp			# Kerberos de-multiplexor
-zephyr-srv	2102/udp			# Zephyr server
-zephyr-clt	2103/udp			# Zephyr serv-hm connection
-zephyr-hm	2104/udp			# Zephyr hostmanager
-eklogin		2105/tcp			# Kerberos encrypted rlogin
+kerberos4       750/udp         kerberos-iv kdc # Kerberos (server)
+kerberos4       750/tcp         kerberos-iv kdc
+kerberos_master 751/udp                         # Kerberos authentication
+kerberos_master 751/tcp
+passwd_server   752/udp                         # Kerberos passwd server
+krb_prop        754/tcp         krb5_prop hprop # Kerberos slave propagation
+krbupdate       760/tcp         kreg            # Kerberos registration
+kpasswd         761/tcp         kpwd            # Kerberos &quot;passwd&quot;
+swat            901/tcp                         # swat
+kpop            1109/tcp                        # Pop with Kerberos
+knetd           2053/tcp                        # Kerberos de-multiplexor
+zephyr-srv      2102/udp                        # Zephyr server
+zephyr-clt      2103/udp                        # Zephyr serv-hm connection
+zephyr-hm       2104/udp                        # Zephyr hostmanager
+eklogin         2105/tcp                        # Kerberos encrypted rlogin
 # Hmmm. Are we using Kv4 or Kv5 now? Worrying.
 # The following is probably Kerberos v5  --- ajt@debian.org (11/02/2000)
-kx		2111/tcp			# X over Kerberos
-iprop		2121/tcp			# incremental propagation
+kx              2111/tcp                        # X over Kerberos
+iprop           2121/tcp                        # incremental propagation
 #
 # Unofficial but necessary (for NetBSD) services
 #
-supfilesrv	871/tcp				# SUP server
-supfiledbg	1127/tcp			# SUP debugging
+supfilesrv      871/tcp                         # SUP server
+supfiledbg      1127/tcp                        # SUP debugging
 
 #
 # Services added for the Debian GNU/Linux distribution
 #
-linuxconf	98/tcp				# LinuxConf
-poppassd	106/tcp				# Eudora
-poppassd	106/udp
-ssmtp		465/tcp		smtps		# SMTP over SSL
-moira_db	775/tcp				# Moira database
-moira_update	777/tcp				# Moira update protocol
-moira_ureg	779/udp				# Moira user registration
-spamd		783/tcp				# spamassassin daemon
-omirr		808/tcp		omirrd		# online mirror
-omirr		808/udp		omirrd
-customs		1001/tcp			# pmake customs server
-customs		1001/udp
-skkserv		1178/tcp			# skk jisho server port
-predict		1210/udp			# predict -- satellite tracking
-rmtcfg		1236/tcp			# Gracilis Packeten remote config server
-wipld		1300/tcp			# Wipl network monitor
-xtel		1313/tcp			# french minitel
-xtelw		1314/tcp			# french minitel
-support		1529/tcp			# GNATS
-sieve		2000/tcp			# Sieve mail filter daemon
-cfinger		2003/tcp			# GNU Finger
-ndtp		2010/tcp			# Network dictionary transfer protocol
-frox		2121/tcp			# frox: caching ftp proxy
-ninstall	2150/tcp			# ninstall service
-ninstall	2150/udp
-zebrasrv	2600/tcp			# zebra service
-zebra		2601/tcp			# zebra vty
-ripd		2602/tcp			# ripd vty (zebra)
-ripngd		2603/tcp			# ripngd vty (zebra)
-ospfd		2604/tcp			# ospfd vty (zebra)
-bgpd		2605/tcp			# bgpd vty (zebra)
-ospf6d		2606/tcp			# ospf6d vty (zebra)
-ospfapi		2607/tcp			# OSPF-API
-isisd		2608/tcp			# ISISd vty (zebra)
-afbackup	2988/tcp			# Afbackup system
-afbackup	2988/udp
-afmbackup	2989/tcp			# Afmbackup system
-afmbackup	2989/udp
-xtell		4224/tcp			# xtell server
-fax		4557/tcp			# FAX transmission service (old)
-hylafax		4559/tcp			# HylaFAX client-server protocol (new)
-distmp3		4600/tcp			# distmp3host daemon
-munin		4949/tcp	lrrd		# Munin
-enbd-cstatd	5051/tcp			# ENBD client statd
-enbd-sstatd	5052/tcp			# ENBD server statd
-pcrd		5151/tcp			# PCR-1000 Daemon
-noclog		5354/tcp			# noclogd with TCP (nocol)
-noclog		5354/udp			# noclogd with UDP (nocol)
-hostmon		5355/tcp			# hostmon uses TCP (nocol)
-hostmon		5355/udp			# hostmon uses UDP (nocol)
-rplay		5555/udp			# RPlay audio service
-rplay		5555/tcp
-rptp		5556/udp			# Remote Play Transfer Protocol
-rptp		5556/tcp
-nsca		5667/tcp			# Nagios Agent - NSCA
-mrtd		5674/tcp			# MRT Routing Daemon
-bgpsim		5675/tcp			# MRT Routing Simulator
-canna		5680/tcp			# cannaserver
-sane-port	6566/tcp	sane saned	# SANE network scanner daemon
-ircd		6667/tcp			# Internet Relay Chat
-zope-ftp	8021/tcp			# zope management by ftp
-webcache	8080/tcp			# WWW caching service
-tproxy		8081/tcp			# Transparent Proxy
-omniorb		8088/tcp			# OmniORB
-omniorb		8088/udp
-clc-build-daemon 8990/tcp			# Common lisp build daemon
-xinetd		9098/tcp
-mandelspawn	9359/udp	mandelbrot	# network mandelbrot
-zope		9673/tcp			# zope server
-kamanda		10081/tcp			# amanda backup services (Kerberos)
-kamanda		10081/udp
-amandaidx	10082/tcp			# amanda backup services
-amidxtape	10083/tcp			# amanda backup services
-smsqp		11201/tcp			# Alamin SMS gateway
-smsqp		11201/udp
-xpilot		15345/tcp			# XPilot Contact Port
-xpilot		15345/udp
-sgi-cmsd	17001/udp		# Cluster membership services daemon
-sgi-crsd	17002/udp
-sgi-gcd		17003/udp			# SGI Group membership daemon
-sgi-cad		17004/tcp			# Cluster Admin daemon
-isdnlog		20011/tcp			# isdn logging system
-isdnlog		20011/udp
-vboxd		20012/tcp			# voice box system
-vboxd		20012/udp
-binkp		24554/tcp			# binkp fidonet protocol
-asp		27374/tcp			# Address Search Protocol
-asp		27374/udp
-dircproxy	57000/tcp			# Detachable IRC Proxy
-tfido		60177/tcp			# fidonet EMSI over telnet
-fido		60179/tcp			# fidonet EMSI over TCP
+linuxconf       98/tcp                          # LinuxConf
+poppassd        106/tcp                         # Eudora
+poppassd        106/udp
+ssmtp           465/tcp         smtps           # SMTP over SSL
+moira_db        775/tcp                         # Moira database
+moira_update    777/tcp                         # Moira update protocol
+moira_ureg      779/udp                         # Moira user registration
+spamd           783/tcp                         # spamassassin daemon
+omirr           808/tcp         omirrd          # online mirror
+omirr           808/udp         omirrd
+customs         1001/tcp                        # pmake customs server
+customs         1001/udp
+skkserv         1178/tcp                        # skk jisho server port
+predict         1210/udp                        # predict -- satellite tracking
+rmtcfg          1236/tcp                        # Gracilis Packeten remote config server
+wipld           1300/tcp                        # Wipl network monitor
+xtel            1313/tcp                        # french minitel
+xtelw           1314/tcp                        # french minitel
+support         1529/tcp                        # GNATS
+sieve           2000/tcp                        # Sieve mail filter daemon
+cfinger         2003/tcp                        # GNU Finger
+ndtp            2010/tcp                        # Network dictionary transfer protocol
+frox            2121/tcp                        # frox: caching ftp proxy
+ninstall        2150/tcp                        # ninstall service
+ninstall        2150/udp
+zebrasrv        2600/tcp                        # zebra service
+zebra           2601/tcp                        # zebra vty
+ripd            2602/tcp                        # ripd vty (zebra)
+ripngd          2603/tcp                        # ripngd vty (zebra)
+ospfd           2604/tcp                        # ospfd vty (zebra)
+bgpd            2605/tcp                        # bgpd vty (zebra)
+ospf6d          2606/tcp                        # ospf6d vty (zebra)
+ospfapi         2607/tcp                        # OSPF-API
+isisd           2608/tcp                        # ISISd vty (zebra)
+afbackup        2988/tcp                        # Afbackup system
+afbackup        2988/udp
+afmbackup       2989/tcp                        # Afmbackup system
+afmbackup       2989/udp
+xtell           4224/tcp                        # xtell server
+fax             4557/tcp                        # FAX transmission service (old)
+hylafax         4559/tcp                        # HylaFAX client-server protocol (new)
+distmp3         4600/tcp                        # distmp3host daemon
+munin           4949/tcp        lrrd            # Munin
+enbd-cstatd     5051/tcp                        # ENBD client statd
+enbd-sstatd     5052/tcp                        # ENBD server statd
+pcrd            5151/tcp                        # PCR-1000 Daemon
+noclog          5354/tcp                        # noclogd with TCP (nocol)
+noclog          5354/udp                        # noclogd with UDP (nocol)
+hostmon         5355/tcp                        # hostmon uses TCP (nocol)
+hostmon         5355/udp                        # hostmon uses UDP (nocol)
+rplay           5555/udp                        # RPlay audio service
+rplay           5555/tcp
+rptp            5556/udp                        # Remote Play Transfer Protocol
+rptp            5556/tcp
+nsca            5667/tcp                        # Nagios Agent - NSCA
+mrtd            5674/tcp                        # MRT Routing Daemon
+bgpsim          5675/tcp                        # MRT Routing Simulator
+canna           5680/tcp                        # cannaserver
+sane-port       6566/tcp        sane saned      # SANE network scanner daemon
+ircd            6667/tcp                        # Internet Relay Chat
+zope-ftp        8021/tcp                        # zope management by ftp
+webcache        8080/tcp                        # WWW caching service
+tproxy          8081/tcp                        # Transparent Proxy
+omniorb         8088/tcp                        # OmniORB
+omniorb         8088/udp
+clc-build-daemon 8990/tcp                       # Common lisp build daemon
+xinetd          9098/tcp
+mandelspawn     9359/udp        mandelbrot      # network mandelbrot
+zope            9673/tcp                        # zope server
+kamanda         10081/tcp                       # amanda backup services (Kerberos)
+kamanda         10081/udp
+amandaidx       10082/tcp                       # amanda backup services
+amidxtape       10083/tcp                       # amanda backup services
+smsqp           11201/tcp                       # Alamin SMS gateway
+smsqp           11201/udp
+xpilot          15345/tcp                       # XPilot Contact Port
+xpilot          15345/udp
+sgi-cmsd        17001/udp               # Cluster membership services daemon
+sgi-crsd        17002/udp
+sgi-gcd         17003/udp                       # SGI Group membership daemon
+sgi-cad         17004/tcp                       # Cluster Admin daemon
+isdnlog         20011/tcp                       # isdn logging system
+isdnlog         20011/udp
+vboxd           20012/tcp                       # voice box system
+vboxd           20012/udp
+binkp           24554/tcp                       # binkp fidonet protocol
+asp             27374/tcp                       # Address Search Protocol
+asp             27374/udp
+dircproxy       57000/tcp                       # Detachable IRC Proxy
+tfido           60177/tcp                       # fidonet EMSI over telnet
+fido            60179/tcp                       # fidonet EMSI over TCP
 
 # Local services</diff>
      <filename>test/data/types/port/1</filename>
    </modified>
    <modified>
      <diff>@@ -7,14 +7,14 @@
 #
 # The latest IANA port assignments can be gotten from
 #
-#	http://www.iana.org/assignments/port-numbers
+#       http://www.iana.org/assignments/port-numbers
 #
 # The Well Known Ports are those from 0 through 1023.
 # The Registered Ports are those from 1024 through 49151
 # The Dynamic and/or Private Ports are those from 49152 through 65535
 #
 # $FreeBSD: src/etc/services,v 1.89 2002/12/17 23:59:10 eric Exp $
-#	From: @(#)services	5.8 (Berkeley) 5/9/91
+#       From: @(#)services      5.8 (Berkeley) 5/9/91
 #
 # WELL KNOWN PORT NUMBERS
 #
@@ -370,9 +370,9 @@ ansatrader      124/tcp     # ANSA REX Trader
 locus-map       125/udp     # Locus PC-Interface Net Map Ser
 locus-map       125/tcp     # Locus PC-Interface Net Map Ser
 #                          Eric Peterson &lt;lcc.eric@SEAS.UCLA.EDU&gt;
-nxedit		126/udp     # NXEdit
-nxedit		126/tcp     # NXEdit
-#			   Don Payette &lt;Don.Payette@unisys.com&gt;
+nxedit          126/udp     # NXEdit
+nxedit          126/tcp     # NXEdit
+#                          Don Payette &lt;Don.Payette@unisys.com&gt;
 ###########Port 126 Previously assigned to application below#######
 #unitary         126/tcp    Unisys Unitary Login
 #unitary         126/udp    Unisys Unitary Login
@@ -423,9 +423,9 @@ bl-idm          142/tcp     # Britton-Lee IDM
 imap            143/udp     # Internet Message Access Protocol
 imap            143/tcp     # Internet Message Access Protocol
 #                          Mark Crispin &lt;MRC@CAC.Washington.EDU&gt;
-uma		144/udp     # Universal Management Architecture
-uma 		144/tcp     # Universal Management Architecture
-#			   Jay Whitney &lt;jw@powercenter.com&gt;
+uma             144/udp     # Universal Management Architecture
+uma             144/tcp     # Universal Management Architecture
+#                          Jay Whitney &lt;jw@powercenter.com&gt;
 uaac            145/udp     # UAAC Protocol             
 uaac            145/tcp     # UAAC Protocol             
 #                          David A. Gomberg &lt;gomberg@GATEWAY.MITRE.ORG&gt;
@@ -436,7 +436,7 @@ iso-ip          147/tcp     # ISO-IP
 #                          Marshall Rose &lt;mrose@dbc.mtview.ca.us&gt;
 jargon          148/udp     # Jargon
 jargon          148/tcp     # Jargon
-#			   Bill Weinman &lt;wew@bearnet.com&gt;
+#                          Bill Weinman &lt;wew@bearnet.com&gt;
 aed-512         149/udp     # AED 512 Emulation Service           
 aed-512         149/tcp     # AED 512 Emulation Service           
 #                          Albert G. Broscius &lt;broscius@DSL.CIS.UPENN.EDU&gt;
@@ -614,7 +614,7 @@ anet            212/udp     # ATEXSSTR
 anet            212/tcp     # ATEXSSTR   
 #                          Jim Taylor &lt;taylor@heart.epps.kodak.com&gt;
 ipx             213/udp     # IPX                                
-ipx             213/tcp     # IPX         	                      
+ipx             213/tcp     # IPX
 #                          Don Provan &lt;donp@xlnvax.novell.com&gt;
 vmpwscs         214/udp     # VM PWSCS                         
 vmpwscs         214/tcp     # VM PWSCS                         
@@ -647,9 +647,9 @@ cdc             223/tcp     # Certificate Distribution Center
 #               Kannan Alagappan &lt;kannan@sejour.enet.dec.com&gt;
 ########### Possible Conflict of Port 222 with &quot;Masqdialer&quot;##############
 ### Contact for Masqdialer is Charles Wright &lt;cpwright@villagenet.com&gt;###
-masqdialer	224/udp     # masqdialer
-masqdialer	224/tcp     # masqdialer
-#			   Charles Wright &lt;cpwright@villagenet.com&gt;
+masqdialer      224/udp     # masqdialer
+masqdialer      224/tcp     # masqdialer
+#                          Charles Wright &lt;cpwright@villagenet.com&gt;
 #               225-241    Reserved
 #                          Jon Postel &lt;postel@isi.edu&gt;
 direct          242/udp     # Direct
@@ -660,7 +660,7 @@ sur-meas        243/tcp     # Survey Measurement
 #                          Dave Clark &lt;ddc@LCS.MIT.EDU&gt;
 inbusiness      244/udp     # inbusiness
 inbusiness      244/tcp     # inbusiness
-#			   Derrick Hisatake &lt;derrick.i.hisatake@intel.com&gt;
+#                          Derrick Hisatake &lt;derrick.i.hisatake@intel.com&gt;
 link            245/udp     # LINK
 link            245/tcp     # LINK
 dsp3270         246/udp     # Display Systems Protocol        
@@ -668,10 +668,10 @@ dsp3270         246/tcp     # Display Systems Protocol
 #                          Weldon J. Showalter &lt;Gamma@MINTAKA.DCA.MIL&gt;
 subntbcst_tftp  247/udp     # SUBNTBCST_TFTP
 subntbcst_tftp  247/tcp     # SUBNTBCST_TFTP
-#			   John Fake &lt;fake@us.ibm.com&gt;
-bhfhs		248/udp     # bhfhs
-bhfhs		248/tcp     # bhfhs
-#			   John Kelly &lt;johnk@bellhow.com&gt;
+#                          John Fake &lt;fake@us.ibm.com&gt;
+bhfhs           248/udp     # bhfhs
+bhfhs           248/tcp     # bhfhs
+#                          John Kelly &lt;johnk@bellhow.com&gt;
 #               249-255    Reserved
 #                          Jon Postel &lt;postel@isi.edu&gt;
 rap             256/udp     # RAP
@@ -689,21 +689,21 @@ esro-gen        259/tcp     # Efficient Short Remote Operations
 openport        260/udp     # Openport
 openport        260/tcp     # Openport
 #                          John Marland &lt;jmarland@dean.openport.com&gt;
-nsiiops		261/udp     # IIOP Name Service over TLS/SSL
-nsiiops 	261/tcp     # IIOP Name Service over TLS/SSL
+nsiiops         261/udp     # IIOP Name Service over TLS/SSL
+nsiiops         261/tcp     # IIOP Name Service over TLS/SSL
 #                          Jeff Stewart &lt;jstewart@netscape.com&gt;
-arcisdms	262/udp	    # Arcisdms
-arcisdms	262/tcp     # Arcisdms
-#			   Russell Crook (rmc@sni.ca&gt;
-hdap		263/udp     # HDAP
-hdap		263/tcp     # HDAP
-#			   Troy Gau &lt;troy@zyxel.com&gt;
-bgmp		264/udp     # BGMP
-bgmp		264/tcp     # BGMP
-#			   Dave Thaler &lt;thalerd@eecs.umich.edu&gt;
-x-bone-ctl	265/udp     # X-Bone CTL
-x-bone-ctl	265/tcp     # X-Bone CTL
-#			   Joe Touch &lt;touch@isi.edu&gt;
+arcisdms        262/udp     # Arcisdms
+arcisdms        262/tcp     # Arcisdms
+#                          Russell Crook (rmc@sni.ca&gt;
+hdap            263/udp     # HDAP
+hdap            263/tcp     # HDAP
+#                          Troy Gau &lt;troy@zyxel.com&gt;
+bgmp            264/udp     # BGMP
+bgmp            264/tcp     # BGMP
+#                          Dave Thaler &lt;thalerd@eecs.umich.edu&gt;
+x-bone-ctl      265/udp     # X-Bone CTL
+x-bone-ctl      265/tcp     # X-Bone CTL
+#                          Joe Touch &lt;touch@isi.edu&gt;
 sst             266/udp     # SCSI on ST
 sst             266/tcp     # SCSI on ST
 #                          Donald D. Woelz &lt;don@genroco.com&gt;
@@ -717,18 +717,18 @@ http-mgmt       280/udp     # http-mgmt
 http-mgmt       280/tcp     # http-mgmt
 #                          Adrian Pell
 #                          &lt;PELL_ADRIAN/HP-UnitedKingdom_om6@hplb.hpl.hp.com&gt;
-personal-link	281/udp     # Personal Link
-personal-link   281/tcp	    # Personal Link
-#			   Dan Cummings &lt;doc@cnr.com&gt;
-cableport-ax	282/udp     # Cable Port A/X
-cableport-ax	282/tcp     # Cable Port A/X
-#			   Craig Langfahl &lt;Craig_J_Langfahl@ccm.ch.intel.com&gt;
-rescap		283/udp     # rescap
-rescap		283/tcp     # rescap
-#			   Paul Hoffman &lt;phoffman@imc.org&gt;
-corerjd		284/udp     # corerjd
-corerjd		284/tcp     # corerjd
-#			   Chris Thornhill &lt;cjt@corenetworks.com&gt;
+personal-link   281/udp     # Personal Link
+personal-link   281/tcp     # Personal Link
+#                          Dan Cummings &lt;doc@cnr.com&gt;
+cableport-ax    282/udp     # Cable Port A/X
+cableport-ax    282/tcp     # Cable Port A/X
+#                          Craig Langfahl &lt;Craig_J_Langfahl@ccm.ch.intel.com&gt;
+rescap          283/udp     # rescap
+rescap          283/tcp     # rescap
+#                          Paul Hoffman &lt;phoffman@imc.org&gt;
+corerjd         284/udp     # corerjd
+corerjd         284/tcp     # corerjd
+#                          Chris Thornhill &lt;cjt@corenetworks.com&gt;
 #               285        Unassigned  
 fxp-1           286/udp     # FXP-1
 fxp-1           286/tcp     # FXP-1
@@ -737,55 +737,55 @@ k-block         287/udp     # K-BLOCK
 k-block         287/tcp     # K-BLOCK
 #                          Simon P Jackson &lt;jacko@kring.co.uk&gt;    
 #               288-307    Unassigned
-novastorbakcup	308/udp     # Novastor Backup
-novastorbakcup	308/tcp     # Novastor Backup
-#			   Brian Dickman &lt;brian@novastor.com&gt;
+novastorbakcup  308/udp     # Novastor Backup
+novastorbakcup  308/tcp     # Novastor Backup
+#                          Brian Dickman &lt;brian@novastor.com&gt;
 entrusttime     309/udp     # EntrustTime    
 entrusttime     309/tcp     # EntrustTime    
 #                          Peter Whittaker &lt;pww@entrust.com&gt;
-bhmds 		310/udp     # bhmds
-bhmds		310/tcp     # bhmds
-#			   John Kelly &lt;johnk@bellhow.com&gt;
-asip-webadmin	311/udp     # AppleShare IP WebAdmin
-asip-webadmin	311/tcp     # AppleShare IP WebAdmin
-#			   Ann Huang &lt;annhuang@apple.com&gt;
-vslmp		312/udp     # VSLMP
-vslmp		312/tcp     # VSLMP
-#			   Gerben Wierda &lt;Gerben_Wierda@RnA.nl&gt;
-magenta-logic	313/udp	    # Magenta Logic
-magenta-logic	313/tcp     # Magenta Logic
-#			   Karl Rousseau &lt;kr@netfusion.co.uk&gt;
-opalis-robot	314/udp     # Opalis Robot
-opalis-robot	314/tcp     # Opalis Robot
-#			   Laurent Domenech, Opalis &lt;ldomenech@opalis.com&gt;
-dpsi		315/udp     # DPSI
-dpsi		315/tcp     # DPSI
-#			   Tony Scamurra &lt;Tony@DesktopPaging.com&gt;
-decauth		316/udp     # decAuth
-decauth		316/tcp     # decAuth
-#			   Michael Agishtein &lt;misha@unx.dec.com&gt;
-zannet		317/udp     # Zannet
-zannet		317/tcp     # Zannet
-#			   Zan Oliphant &lt;zan@accessone.com&gt;
-pkix-timestamp	318/udp     # PKIX TimeStamp
-pkix-timestamp	318/tcp     # PKIX TimeStamp
-#			   Robert Zuccherato &lt;robert.zuccherato@entrust.com&gt;
-ptp-event	319/udp     # PTP Event
-ptp-event	319/tcp     # PTP Event
-ptp-general	320/udp     # PTP General
-ptp-general	320/tcp     # PTP General
-#			   John Eidson &lt;eidson@hpl.hp.com&gt;
-pip		321/udp     # PIP
-pip		321/tcp     # PIP
-#			   Gordon Mohr &lt;gojomo@usa.net&gt;
-rtsps		322/udp     # RTSPS
-rtsps		322/tcp     # RTSPS
-#			   Anders Klemets &lt;anderskl@microsoft.com&gt;
+bhmds           310/udp     # bhmds
+bhmds           310/tcp     # bhmds
+#                          John Kelly &lt;johnk@bellhow.com&gt;
+asip-webadmin   311/udp     # AppleShare IP WebAdmin
+asip-webadmin   311/tcp     # AppleShare IP WebAdmin
+#                          Ann Huang &lt;annhuang@apple.com&gt;
+vslmp           312/udp     # VSLMP
+vslmp           312/tcp     # VSLMP
+#                          Gerben Wierda &lt;Gerben_Wierda@RnA.nl&gt;
+magenta-logic   313/udp     # Magenta Logic
+magenta-logic   313/tcp     # Magenta Logic
+#                          Karl Rousseau &lt;kr@netfusion.co.uk&gt;
+opalis-robot    314/udp     # Opalis Robot
+opalis-robot    314/tcp     # Opalis Robot
+#                          Laurent Domenech, Opalis &lt;ldomenech@opalis.com&gt;
+dpsi            315/udp     # DPSI
+dpsi            315/tcp     # DPSI
+#                          Tony Scamurra &lt;Tony@DesktopPaging.com&gt;
+decauth         316/udp     # decAuth
+decauth         316/tcp     # decAuth
+#                          Michael Agishtein &lt;misha@unx.dec.com&gt;
+zannet          317/udp     # Zannet
+zannet          317/tcp     # Zannet
+#                          Zan Oliphant &lt;zan@accessone.com&gt;
+pkix-timestamp  318/udp     # PKIX TimeStamp
+pkix-timestamp  318/tcp     # PKIX TimeStamp
+#                          Robert Zuccherato &lt;robert.zuccherato@entrust.com&gt;
+ptp-event       319/udp     # PTP Event
+ptp-event       319/tcp     # PTP Event
+ptp-general     320/udp     # PTP General
+ptp-general     320/tcp     # PTP General
+#                          John Eidson &lt;eidson@hpl.hp.com&gt;
+pip             321/udp     # PIP
+pip             321/tcp     # PIP
+#                          Gordon Mohr &lt;gojomo@usa.net&gt;
+rtsps           322/udp     # RTSPS
+rtsps           322/tcp     # RTSPS
+#                          Anders Klemets &lt;anderskl@microsoft.com&gt;
 #               323-332    Unassigned
-texar		333/udp     # Texar Security Port
-texar		333/tcp     # Texar Security Port
-#			   Eugen Bacic &lt;ebacic@texar.com&gt;
-#		334-343    Unassigned
+texar           333/udp     # Texar Security Port
+texar           333/tcp     # Texar Security Port
+#                          Eugen Bacic &lt;ebacic@texar.com&gt;
+#               334-343    Unassigned
 pdap            344/udp     # Prospero Data Access Protocol
 pdap            344/tcp     # Prospero Data Access Protocol
 #                          B. Clifford Neuman &lt;bcn@isi.edu&gt;
@@ -800,75 +800,75 @@ csi-sgwp        348/tcp     # Cabletron Management Protocol
 mftp            349/udp     # mftp
 mftp            349/tcp     # mftp
 #                          Dave Feinleib &lt;davefe@microsoft.com&gt;
-matip-type-a	350/udp     # MATIP Type A
+matip-type-a    350/udp     # MATIP Type A
 matip-type-a    350/tcp     # MATIP Type A
 matip-type-b    351/udp     # MATIP Type B
 matip-type-b    351/tcp     # MATIP Type B
-#			   Alain Robert &lt;arobert@par.sita.int&gt;
+#                          Alain Robert &lt;arobert@par.sita.int&gt;
 # The following entry records an unassigned but widespread use
-bhoetty		351/udp     # bhoetty
-bhoetty		351/tcp	    # bhoetty (added 5/21/97)
-#			   John Kelly &lt;johnk@bellhow.com&gt;
-dtag-ste-sb	352/udp	    # DTAG
-dtag-ste-sb	352/tcp	    # DTAG (assigned long ago)
-#			   Ruediger Wald &lt;wald@ez-darmstadt.telekom.de&gt;
+bhoetty         351/udp     # bhoetty
+bhoetty         351/tcp     # bhoetty (added 5/21/97)
+#                          John Kelly &lt;johnk@bellhow.com&gt;
+dtag-ste-sb     352/udp     # DTAG
+dtag-ste-sb     352/tcp     # DTAG (assigned long ago)
+#                          Ruediger Wald &lt;wald@ez-darmstadt.telekom.de&gt;
 # The following entry records an unassigned but widespread use
-bhoedap4	352/udp     # bhoedap4
-bhoedap4	352/tcp     # bhoedap4 (added 5/21/97)
-#			   John Kelly &lt;johnk@bellhow.com&gt;
-ndsauth		353/udp     # NDSAUTH
-ndsauth		353/tcp     # NDSAUTH
-#			   Jayakumar Ramalingam &lt;jayakumar@novell.com&gt;
-bh611		354/udp     # bh611
-bh611		354/tcp	    # bh611
-#			   John Kelly &lt;johnk@bellhow.com&gt;
-datex-asn	355/udp     # DATEX-ASN
-datex-asn	355/tcp	    # DATEX-ASN
-#			   Kenneth Vaughn &lt;kvaughn@mail.viggen.com&gt;
-cloanto-net-1	356/udp     # Cloanto Net 1
-cloanto-net-1	356/tcp     # Cloanto Net 1
-#			   Michael Battilana &lt;mcb-iana@cloanto.com&gt;
-bhevent		357/udp     # bhevent
-bhevent		357/tcp	    # bhevent
-#			   John Kelly &lt;johnk@bellhow.com&gt;
-shrinkwrap	358/udp     # Shrinkwrap
-shrinkwrap	358/tcp     # Shrinkwrap
-#			   Bill Simpson &lt;wsimpson@greendragon.com&gt;
-nsrmp      	359/udp     # Network Security Risk Management Protocol
-nsrmp	        359/tcp     # Network Security Risk Management Protocol
-#			   Eric Jacksch &lt;jacksch@tenebris.ca&gt;
-scoi2odialog	360/udp     # scoi2odialog
-scoi2odialog	360/tcp     # scoi2odialog
-#			   Keith Petley &lt;keithp@sco.COM&gt;
-semantix	361/udp     # Semantix
-semantix	361/tcp     # Semantix
-#		   	   Semantix &lt;xsSupport@semantix.com&gt;
-srssend		362/udp     # SRS Send
-srssend		362/tcp     # SRS Send
-#			   Curt Mayer &lt;curt@emergent.com&gt;
-rsvp_tunnel	363/udp     # RSVP Tunnel
-rsvp_tunnel	363/tcp     # RSVP Tunnel
-#			   Andreas Terzis &lt;terzis@cs.ucla.edu&gt;
-aurora-cmgr	364/udp     # Aurora CMGR
-aurora-cmgr	364/tcp     # Aurora CMGR
-#			   Philip Budne &lt;budne@auroratech.com&gt;
-dtk		365/udp     # DTK
-dtk		365/tcp     # DTK
-#			   Fred Cohen &lt;fc@all.net&gt;
-odmr		366/udp     # ODMR
-odmr		366/tcp     # ODMR
-#			   Randall Gellens &lt;randy@qualcomm.com&gt;
-mortgageware	367/udp     # MortgageWare
-mortgageware	367/tcp     # MortgageWare
-#			   Ole Hellevik &lt;oleh@interlinq.com&gt;
-qbikgdp		368/udp     # QbikGDP
-qbikgdp		368/tcp     # QbikGDP
-#			   Adrien de Croy &lt;adrien@qbik.com&gt;
-rpc2portmap	369/udp     # rpc2portmap
-rpc2portmap	369/tcp     # rpc2portmap 
-codaauth2	370/udp     # codaauth2
-codaauth2	370/tcp     # codaauth2
-#			   Robert Watson &lt;robert@cyrus.watson.org&gt;
+bhoedap4        352/udp     # bhoedap4
+bhoedap4        352/tcp     # bhoedap4 (added 5/21/97)
+#                          John Kelly &lt;johnk@bellhow.com&gt;
+ndsauth         353/udp     # NDSAUTH
+ndsauth         353/tcp     # NDSAUTH
+#                          Jayakumar Ramalingam &lt;jayakumar@novell.com&gt;
+bh611           354/udp     # bh611
+bh611           354/tcp     # bh611
+#                          John Kelly &lt;johnk@bellhow.com&gt;
+datex-asn       355/udp     # DATEX-ASN
+datex-asn       355/tcp     # DATEX-ASN
+#                          Kenneth Vaughn &lt;kvaughn@mail.viggen.com&gt;
+cloanto-net-1   356/udp     # Cloanto Net 1
+cloanto-net-1   356/tcp     # Cloanto Net 1
+#                          Michael Battilana &lt;mcb-iana@cloanto.com&gt;
+bhevent         357/udp     # bhevent
+bhevent         357/tcp     # bhevent
+#                          John Kelly &lt;johnk@bellhow.com&gt;
+shrinkwrap      358/udp     # Shrinkwrap
+shrinkwrap      358/tcp     # Shrinkwrap
+#                          Bill Simpson &lt;wsimpson@greendragon.com&gt;
+nsrmp           359/udp     # Network Security Risk Management Protocol
+nsrmp           359/tcp     # Network Security Risk Management Protocol
+#                          Eric Jacksch &lt;jacksch@tenebris.ca&gt;
+scoi2odialog    360/udp     # scoi2odialog
+scoi2odialog    360/tcp     # scoi2odialog
+#                          Keith Petley &lt;keithp@sco.COM&gt;
+semantix        361/udp     # Semantix
+semantix        361/tcp     # Semantix
+#                          Semantix &lt;xsSupport@semantix.com&gt;
+srssend         362/udp     # SRS Send
+srssend         362/tcp     # SRS Send
+#                          Curt Mayer &lt;curt@emergent.com&gt;
+rsvp_tunnel     363/udp     # RSVP Tunnel
+rsvp_tunnel     363/tcp     # RSVP Tunnel
+#                          Andreas Terzis &lt;terzis@cs.ucla.edu&gt;
+aurora-cmgr     364/udp     # Aurora CMGR
+aurora-cmgr     364/tcp     # Aurora CMGR
+#                          Philip Budne &lt;budne@auroratech.com&gt;
+dtk             365/udp     # DTK
+dtk             365/tcp     # DTK
+#                          Fred Cohen &lt;fc@all.net&gt;
+odmr            366/udp     # ODMR
+odmr            366/tcp     # ODMR
+#                          Randall Gellens &lt;randy@qualcomm.com&gt;
+mortgageware    367/udp     # MortgageWare
+mortgageware    367/tcp     # MortgageWare
+#                          Ole Hellevik &lt;oleh@interlinq.com&gt;
+qbikgdp         368/udp     # QbikGDP
+qbikgdp         368/tcp     # QbikGDP
+#                          Adrien de Croy &lt;adrien@qbik.com&gt;
+rpc2portmap     369/udp     # rpc2portmap
+rpc2portmap     369/tcp     # rpc2portmap
+codaauth2       370/udp     # codaauth2
+codaauth2       370/tcp     # codaauth2
+#                          Robert Watson &lt;robert@cyrus.watson.org&gt;
 clearcase       371/udp     # Clearcase
 clearcase       371/tcp     # Clearcase
 #                          Dave LeBlang &lt;leglang@atria.com&gt;
@@ -1021,7 +1021,7 @@ opc-job-track   424/tcp     # IBM Operations Planning and Control Track
 #                          Conny Larsson  &lt;cocke@VNET.IBM.COM&gt;
 icad-el         425/udp     # ICAD
 icad-el         425/tcp     # ICAD
-#		           Larry Stone	&lt;lcs@icad.com&gt;
+#                          Larry Stone  &lt;lcs@icad.com&gt;
 smartsdp        426/udp     # smartsdp
 smartsdp        426/tcp     # smartsdp
 #                          Alexander Dupuy &lt;dupuy@smarts.com&gt;
@@ -1085,7 +1085,7 @@ ddm-dfm         447/tcp     # DDM-RFM
 #                          Jan David Fisher &lt;jdfisher@VNET.IBM.COM&gt;
 ddm-ssl         448/udp     # DDM-SSL
 ddm-ssl         448/tcp     # DDM-SSL
-#			   Steve Ritland &lt;srr@vnet.ibm.com&gt;
+#                          Steve Ritland &lt;srr@vnet.ibm.com&gt;
 as-servermap    449/udp     # AS Server Mapper
 as-servermap    449/tcp     # AS Server Mapper
 #                          Barbara Foss &lt;BGFOSS@rchvmv.vnet.ibm.com&gt;
@@ -1094,8 +1094,8 @@ tserver         450/tcp     # Computer Supported Telecomunication Applications
 #                          Harvey S. Schultz &lt;harvey@acm.org&gt;
 sfs-smp-net     451/udp     # Cray Network Semaphore server
 sfs-smp-net     451/tcp     # Cray Network Semaphore server
-sfs-config	452/udp     # Cray SFS config server
-sfs-config	452/tcp     # Cray SFS config server
+sfs-config      452/udp     # Cray SFS config server
+sfs-config      452/tcp     # Cray SFS config server
 #                          Walter Poxon &lt;wdp@ironwood.cray.com&gt;
 creativeserver  453/udp     # CreativeServer
 creativeserver  453/tcp     # CreativeServer
@@ -1330,9 +1330,9 @@ ncp             524/udp     # NCP
 ncp             524/tcp     # NCP
 #                          Don Provan &lt;donp@sjf.novell.com&gt;
 timed           525/udp     # timeserver
-timed  	        525/tcp     # timeserver
-tempo	        526/udp     # newdate
-tempo	        526/tcp     # newdate
+timed           525/tcp     # timeserver
+tempo           526/udp     # newdate
+tempo           526/tcp     # newdate
 #                          Unknown
 stx             527/udp     # Stock IXChange
 stx             527/tcp     # Stock IXChange
@@ -1348,8 +1348,8 @@ conference      531/udp     # chat
 conference      531/tcp     # chat
 netnews         532/udp     # readnews
 netnews         532/tcp     # readnews
-netwall	        533/udp     # for emergency broadcasts
-netwall	        533/tcp     # for emergency broadcasts
+netwall         533/udp     # for emergency broadcasts
+netwall         533/tcp     # for emergency broadcasts
 mm-admin        534/udp     # MegaMedia Admin
 mm-admin        534/tcp     # MegaMedia Admin
 #                          Andreas Heidemann &lt;a.heidemann@ais-gmbh.de&gt;
@@ -1367,8 +1367,8 @@ gdomap          538/tcp     # gdomap
 #                          Richard Frith-Macdonald &lt;richard@brainstorm.co.uk&gt;
 apertus-ldp     539/udp     # Apertus Technologies Load Determination
 apertus-ldp     539/tcp     # Apertus Technologies Load Determination
-uucp	        540/udp     # uucpd		
-uucp	        540/tcp     # uucpd		
+uucp            540/udp     # uucpd
+uucp            540/tcp     # uucpd
 uucp-rlogin     541/udp     # uucp-rlogin
 uucp-rlogin     541/tcp     # uucp-rlogin  
 #                          Stuart Lynne &lt;sl@wimsey.com&gt;
@@ -1377,8 +1377,8 @@ commerce        542/tcp     # commerce
 #                          Randy Epstein &lt;repstein@host.net&gt;
 klogin          543/udp # 
 klogin          543/tcp # 
-kshell 	        544/udp     # krcmd
-kshell 	        544/tcp     # krcmd
+kshell          544/udp     # krcmd
+kshell          544/tcp     # krcmd
 appleqtcsrvr    545/udp     # appleqtcsrvr
 appleqtcsrvr    545/tcp     # appleqtcsrvr
 #                          Murali Ranganathan 
@@ -1446,8 +1446,8 @@ ms-rome         569/tcp     # microsoft rome
 #                          Rudolph Balaz &lt;rudolphb@microsoft.com&gt;
 meter           570/udp     # demon
 meter           570/tcp     # demon
-meter	        571/udp     # udemon
-meter	        571/tcp     # udemon
+meter           571/udp     # udemon
+meter           571/tcp     # udemon
 sonar           572/udp     # sonar
 sonar           572/tcp     # sonar
 #                          Keith Moore &lt;moore@cs.utk.edu&gt;
@@ -1467,65 +1467,65 @@ vnas            577/tcp     # vnas
 ipdd            578/udp     # ipdd
 ipdd            578/tcp     # ipdd
 #                          Jay Farhat &lt;jfarhat@ipass.com&gt;
-decbsrv		579/udp     # decbsrv
-decbsrv		579/tcp     # decbsrv
-#			   Rudi Martin &lt;movies::martin&quot;@movies.enet.dec.com&gt;
-sntp-heartbeat  580/udp	    # SNTP HEARTBEAT
+decbsrv         579/udp     # decbsrv
+decbsrv         579/tcp     # decbsrv
+#                          Rudi Martin &lt;movies::martin&quot;@movies.enet.dec.com&gt;
+sntp-heartbeat  580/udp     # SNTP HEARTBEAT
 sntp-heartbeat  580/tcp     # SNTP HEARTBEAT
-#			   Louis Mamakos &lt;louie@uu.net&gt;
-bdp		581/udp	    # Bundle Discovery Protocol
-bdp		581/tcp     # Bundle Discovery Protocol
-#			   Gary Malkin &lt;gmalkin@xylogics.com&gt;
-scc-security    582/udp	    # SCC Security
+#                          Louis Mamakos &lt;louie@uu.net&gt;
+bdp             581/udp     # Bundle Discovery Protocol
+bdp             581/tcp     # Bundle Discovery Protocol
+#                          Gary Malkin &lt;gmalkin@xylogics.com&gt;
+scc-security    582/udp     # SCC Security
 scc-security    582/tcp     # SCC Security
-#			   Prashant Dholakia &lt;prashant@semaphorecom.com&gt;
-philips-vc	583/udp     # Philips Video-Conferencing
-philips-vc	583/tcp     # Philips Video-Conferencing
-#			   Janna Chang &lt;janna@pmc.philips.com&gt;
-keyserver	584/udp	    # Key Server
-keyserver	584/tcp     # Key Server
-#			   Gary Howland &lt;gary@systemics.com&gt;
-imap4-ssl	585/udp     # IMAP4+SSL (use 993 instead)
-imap4-ssl	585/tcp     # IMAP4+SSL (use 993 instead)
-#			   Terry Gray &lt;gray@cac.washington.edu&gt;
+#                          Prashant Dholakia &lt;prashant@semaphorecom.com&gt;
+philips-vc      583/udp     # Philips Video-Conferencing
+philips-vc      583/tcp     # Philips Video-Conferencing
+#                          Janna Chang &lt;janna@pmc.philips.com&gt;
+keyserver       584/udp     # Key Server
+keyserver       584/tcp     # Key Server
+#                          Gary Howland &lt;gary@systemics.com&gt;
+imap4-ssl       585/udp     # IMAP4+SSL (use 993 instead)
+imap4-ssl       585/tcp     # IMAP4+SSL (use 993 instead)
+#                          Terry Gray &lt;gray@cac.washington.edu&gt;
 #               Use of 585 is not recommended, use 993 instead
-password-chg	586/udp	    # Password Change
-password-chg 	586/tcp     # Password Change
-submission	587/udp     # Submission
-submission	587/tcp     # Submission
-#			   Randy Gellens &lt;randy@qualcomm.com&gt;
-cal		588/udp     # CAL
-cal		588/tcp     # CAL
-#			   Myron Hattig &lt;Myron_Hattig@ccm.jf.intel.com&gt;
-eyelink		589/udp	    # EyeLink
-eyelink		589/tcp     # EyeLink
-#			   Dave Stampe &lt;dstampe@psych.toronto.edu&gt;
-tns-cml		590/udp     # TNS CML
-tns-cml		590/tcp     # TNS CML
-#			   Jerome Albin &lt;albin@taec.enet.dec.com&gt;
-http-alt	591/udp     # FileMaker, Inc. - HTTP Alternate (see Port 80)
-http-alt	591/tcp     # FileMaker, Inc. - HTTP Alternate (see Port 80)
-#			   Clay Maeckel &lt;clay_maeckel@filemaker.com&gt;
-eudora-set	592/udp	    # Eudora Set
-eudora-set	592/tcp     # Eudora Set
-#			   Randall Gellens &lt;randy@qualcomm.com&gt;
+password-chg    586/udp     # Password Change
+password-chg    586/tcp     # Password Change
+submission      587/udp     # Submission
+submission      587/tcp     # Submission
+#                          Randy Gellens &lt;randy@qualcomm.com&gt;
+cal             588/udp     # CAL
+cal             588/tcp     # CAL
+#                          Myron Hattig &lt;Myron_Hattig@ccm.jf.intel.com&gt;
+eyelink         589/udp     # EyeLink
+eyelink         589/tcp     # EyeLink
+#                          Dave Stampe &lt;dstampe@psych.toronto.edu&gt;
+tns-cml         590/udp     # TNS CML
+tns-cml         590/tcp     # TNS CML
+#                          Jerome Albin &lt;albin@taec.enet.dec.com&gt;
+http-alt        591/udp     # FileMaker, Inc. - HTTP Alternate (see Port 80)
+http-alt        591/tcp     # FileMaker, Inc. - HTTP Alternate (see Port 80)
+#                          Clay Maeckel &lt;clay_maeckel@filemaker.com&gt;
+eudora-set      592/udp     # Eudora Set
+eudora-set      592/tcp     # Eudora Set
+#                          Randall Gellens &lt;randy@qualcomm.com&gt;
 http-rpc-epmap  593/udp     # HTTP RPC Ep Map
 http-rpc-epmap  593/tcp     # HTTP RPC Ep Map
-#			   Edward Reus &lt;edwardr@microsoft.com&gt;
-tpip		594/udp     # TPIP
-tpip		594/tcp     # TPIP
-#			   Brad Spear &lt;spear@platinum.com&gt;
-cab-protocol	595/udp     # CAB Protocol
-cab-protocol	595/tcp     # CAB Protocol
-#			   Winston Hetherington
+#                          Edward Reus &lt;edwardr@microsoft.com&gt;
+tpip            594/udp     # TPIP
+tpip            594/tcp     # TPIP
+#                          Brad Spear &lt;spear@platinum.com&gt;
+cab-protocol    595/udp     # CAB Protocol
+cab-protocol    595/tcp     # CAB Protocol
+#                          Winston Hetherington
 smsd            596/udp     # SMSD
 smsd            596/tcp     # SMSD
 #                          Wayne Barlow &lt;web@unx.dec.com&gt;
-ptcnameservice	597/udp     # PTC Name Service
-ptcnameservice	597/tcp     # PTC Name Service
+ptcnameservice  597/udp     # PTC Name Service
+ptcnameservice  597/tcp     # PTC Name Service
 #                          Yuri Machkasov &lt;yuri@ptc.com&gt;
-sco-websrvrmg3	598/udp     # SCO Web Server Manager 3
-sco-websrvrmg3	598/tcp     # SCO Web Server Manager 3
+sco-websrvrmg3  598/udp     # SCO Web Server Manager 3
+sco-websrvrmg3  598/tcp     # SCO Web Server Manager 3
 #                          Simon Baldwin &lt;simonb@sco.com&gt;
 acp             599/udp     # Aeolon Core Protocol
 acp             599/tcp     # Aeolon Core Protocol
@@ -1563,68 +1563,68 @@ npmp-local      610/tcp     # npmp-local
 npmp-gui        611/udp     # npmp-gui  
 npmp-gui        611/tcp     # npmp-gui  
 #                          John Barnes &lt;jbarnes@crl.com&gt;
-hmmp-ind	612/udp	    # HMMP Indication
-hmmp-ind	612/tcp     # HMMP Indication
-hmmp-op		613/udp	    # HMMP Operation
-hmmp-op		613/tcp     # HMMP Operation
-#			   Andrew Sinclair &lt;andrsin@microsoft.com&gt;
-sshell   	614/udp	    # SSLshell
-sshell		614/tcp     # SSLshell
-#			   Simon J. Gerraty &lt;sjg@quick.com.au&gt;
-sco-inetmgr	615/udp     # Internet Configuration Manager
-sco-inetmgr	615/tcp	    # Internet Configuration Manager
-sco-sysmgr	616/udp     # SCO System Administration Server
-sco-sysmgr	616/tcp     # SCO System Administration Server
-sco-dtmgr	617/udp     # SCO Desktop Administration Server
-sco-dtmgr	617/tcp     # SCO Desktop Administration Server
-#			   Christopher Durham &lt;chrisdu@sco.com&gt;
-dei-icda	618/udp     # DEI-ICDA
-dei-icda	618/tcp     # DEI-ICDA
-#			   David Turner &lt;digital@Quetico.tbaytel.net&gt;
-compaq-evm	619/udp     # Compaq EVM
-compaq-evm	619/tcp     # Compaq EVM
-#			   Jem Treadwell &lt;Jem.Treadwell@compaq.com&gt;
+hmmp-ind        612/udp     # HMMP Indication
+hmmp-ind        612/tcp     # HMMP Indication
+hmmp-op         613/udp     # HMMP Operation
+hmmp-op         613/tcp     # HMMP Operation
+#                          Andrew Sinclair &lt;andrsin@microsoft.com&gt;
+sshell          614/udp     # SSLshell
+sshell          614/tcp     # SSLshell
+#                          Simon J. Gerraty &lt;sjg@quick.com.au&gt;
+sco-inetmgr     615/udp     # Internet Configuration Manager
+sco-inetmgr     615/tcp     # Internet Configuration Manager
+sco-sysmgr      616/udp     # SCO System Administration Server
+sco-sysmgr      616/tcp     # SCO System Administration Server
+sco-dtmgr       617/udp     # SCO Desktop Administration Server
+sco-dtmgr       617/tcp     # SCO Desktop Administration Server
+#                          Christopher Durham &lt;chrisdu@sco.com&gt;
+dei-icda        618/udp     # DEI-ICDA
+dei-icda        618/tcp     # DEI-ICDA
+#                          David Turner &lt;digital@Quetico.tbaytel.net&gt;
+compaq-evm      619/udp     # Compaq EVM
+compaq-evm      619/tcp     # Compaq EVM
+#                          Jem Treadwell &lt;Jem.Treadwell@compaq.com&gt;
 sco-websrvrmgr  620/udp     # SCO WebServer Manager
 sco-websrvrmgr  620/tcp     # SCO WebServer Manager
-#			   Christopher Durham &lt;chrisdu@sco.com&gt;
-escp-ip		621/udp     # ESCP
-escp-ip		621/tcp     # ESCP
-#			   Lai Zit Seng &lt;lzs@pobox.com&gt;
-collaborator	622/udp	    # Collaborator
-collaborator	622/tcp     # Collaborator
-#			   Johnson Davis &lt;johnsond@opteamasoft.com&gt;
+#                          Christopher Durham &lt;chrisdu@sco.com&gt;
+escp-ip         621/udp     # ESCP
+escp-ip         621/tcp     # ESCP
+#                          Lai Zit Seng &lt;lzs@pobox.com&gt;
+collaborator    622/udp     # Collaborator
+collaborator    622/tcp     # Collaborator
+#                          Johnson Davis &lt;johnsond@opteamasoft.com&gt;
 asf-rmcp        623/udp     # ASF Remote Management and Control Protocol
 asf-rmcp        623/tcp     # ASF Remote Management and Control Protocol
 #                          Carl First &lt;Carl.L.First@intel.com&gt;
-cryptoadmin	624/udp     # Crypto Admin
-cryptoadmin	624/tcp     # Crypto Admin
-#			   Tony Walker &lt;tony@cryptocard.com&gt;
-dec_dlm		625/udp     # DEC DLM
-dec_dlm		625/tcp     # DEC DLM
-#			   Rudi Martin &lt;Rudi.Martin@edo.mts.dec.com&gt;
-asia		626/udp     # ASIA
-asia		626/tcp     # ASIA
-#			   Michael Dasenbrock &lt;dasenbro@apple.com&gt;
-passgo-tivoli	627/udp     # PassGo Tivoli
-passgo-tivoli	627/tcp     # PassGo Tivoli
-#			   Chris Hall &lt;chall@passgo.com&gt;
-qmqp		628/udp     # QMQP
-qmqp		628/tcp     # QMQP
-#			   Dan Bernstein &lt;djb@cr.yp.to&gt;
-3com-amp3	629/udp     # 3Com AMP3
-3com-amp3	629/tcp     # 3Com AMP3
-#			   Prakash Banthia &lt;prakash_banthia@3com.com&gt;
-rda		630/udp     # RDA
-rda		630/tcp     # RDA
-#			   John Hadjioannou &lt;john@minster.co.uk&gt;
-ipp		631/udp     # IPP (Internet Printing Protocol)
-ipp		631/tcp     # IPP (Internet Printing Protocol)
-#			   Carl-Uno Manros &lt;manros@cp10.es.xerox.com&gt;
-bmpp		632/udp     # bmpp
-bmpp		632/tcp     # bmpp
-#			   Troy Rollo &lt;troy@kroll.corvu.com.au&gt;	
-servstat	633/udp     # Service Status update (Sterling Software)
-servstat	633/tcp     # Service Status update (Sterling Software)
+cryptoadmin     624/udp     # Crypto Admin
+cryptoadmin     624/tcp     # Crypto Admin
+#                          Tony Walker &lt;tony@cryptocard.com&gt;
+dec_dlm         625/udp     # DEC DLM
+dec_dlm         625/tcp     # DEC DLM
+#                          Rudi Martin &lt;Rudi.Martin@edo.mts.dec.com&gt;
+asia            626/udp     # ASIA
+asia            626/tcp     # ASIA
+#                          Michael Dasenbrock &lt;dasenbro@apple.com&gt;
+passgo-tivoli   627/udp     # PassGo Tivoli
+passgo-tivoli   627/tcp     # PassGo Tivoli
+#                          Chris Hall &lt;chall@passgo.com&gt;
+qmqp            628/udp     # QMQP
+qmqp            628/tcp     # QMQP
+#                          Dan Bernstein &lt;djb@cr.yp.to&gt;
+3com-amp3       629/udp     # 3Com AMP3
+3com-amp3       629/tcp     # 3Com AMP3
+#                          Prakash Banthia &lt;prakash_banthia@3com.com&gt;
+rda             630/udp     # RDA
+rda             630/tcp     # RDA
+#                          John Hadjioannou &lt;john@minster.co.uk&gt;
+ipp             631/udp     # IPP (Internet Printing Protocol)
+ipp             631/tcp     # IPP (Internet Printing Protocol)
+#                          Carl-Uno Manros &lt;manros@cp10.es.xerox.com&gt;
+bmpp            632/udp     # bmpp
+bmpp            632/tcp     # bmpp
+#                          Troy Rollo &lt;troy@kroll.corvu.com.au&gt;
+servstat        633/udp     # Service Status update (Sterling Software)
+servstat        633/tcp     # Service Status update (Sterling Software)
 #                          Greg Rose &lt;Greg_Rose@sydney.sterling.com&gt;
 ginad           634/udp     # ginad
 ginad           634/tcp     # ginad
@@ -1638,69 +1638,69 @@ ldaps           636/tcp     # ldap protocol over TLS/SSL (was sldap)
 lanserver       637/udp     # lanserver
 lanserver       637/tcp     # lanserver
 #                          Chris Larsson &lt;clarsson@VNET.IBM.COM&gt;
-mcns-sec	638/udp     # mcns-sec
-mcns-sec	638/tcp     # mcns-sec
-#			   Kaz Ozawa &lt;k.ozawa@cablelabs.com&gt;
-msdp		639/udp     # MSDP
-msdp		639/tcp     # MSDP
-#			   Dino Farinacci &lt;dino@cisco.com&gt;
-entrust-sps	640/udp     # entrust-sps
-entrust-sps	640/tcp     # entrust-sps
-#			   Marek Buchler &lt;Marek.Buchler@entrust.com&gt;
-repcmd		641/udp     # repcmd
-repcmd		641/tcp     # repcmd
-#			   Scott Dale &lt;scott@Replicase.com&gt;
-esro-emsdp	642/udp     # ESRO-EMSDP V1.3
-esro-emsdp	642/tcp     # ESRO-EMSDP V1.3
-#			   Mohsen Banan &lt;mohsen@neda.com&gt; 
-sanity		643/udp     # SANity
-sanity		643/tcp     # SANity
-#			   Peter Viscarola &lt;PeterGV@osr.com&gt;
-dwr		644/udp     # dwr
-dwr		644/tcp     # dwr
-#			   Bill Fenner &lt;fenner@parc.xerox.com&gt;
-pssc		645/udp     # PSSC
-pssc		645/tcp     # PSSC
-#			   Egon Meier-Engelen &lt;egon.meier-engelen@dlr.de&gt;
-ldp		646/udp     # LDP
-ldp		646/tcp     # LDP
-#			   Bob Thomas &lt;rhthomas@cisco.com&gt;
+mcns-sec        638/udp     # mcns-sec
+mcns-sec        638/tcp     # mcns-sec
+#                          Kaz Ozawa &lt;k.ozawa@cablelabs.com&gt;
+msdp            639/udp     # MSDP
+msdp            639/tcp     # MSDP
+#                          Dino Farinacci &lt;dino@cisco.com&gt;
+entrust-sps     640/udp     # entrust-sps
+entrust-sps     640/tcp     # entrust-sps
+#                          Marek Buchler &lt;Marek.Buchler@entrust.com&gt;
+repcmd          641/udp     # repcmd
+repcmd          641/tcp     # repcmd
+#                          Scott Dale &lt;scott@Replicase.com&gt;
+esro-emsdp      642/udp     # ESRO-EMSDP V1.3
+esro-emsdp      642/tcp     # ESRO-EMSDP V1.3
+#                          Mohsen Banan &lt;mohsen@neda.com&gt;
+sanity          643/udp     # SANity
+sanity          643/tcp     # SANity
+#                          Peter Viscarola &lt;PeterGV@osr.com&gt;
+dwr             644/udp     # dwr
+dwr             644/tcp     # dwr
+#                          Bill Fenner &lt;fenner@parc.xerox.com&gt;
+pssc            645/udp     # PSSC
+pssc            645/tcp     # PSSC
+#                          Egon Meier-Engelen &lt;egon.meier-engelen@dlr.de&gt;
+ldp             646/udp     # LDP
+ldp             646/tcp     # LDP
+#                          Bob Thomas &lt;rhthomas@cisco.com&gt;
 dhcp-failover   647/udp     # DHCP Failover
 dhcp-failover   647/tcp     # DHCP Failover
 #                          Bernard Volz &lt;volz@ipworks.com&gt; 
 rrp             648/udp     # Registry Registrar Protocol (RRP)
 rrp             648/tcp     # Registry Registrar Protocol (RRP)
-#                          Scott Hollenbeck &lt;shollenb@netsol.com&gt;	
+#                          Scott Hollenbeck &lt;shollenb@netsol.com&gt;
 cadview-3d      649/udp     # Cadview-3d - streaming 3d models over the internet
 cadview-3d      649/tcp     # Cadview-3d - streaming 3d models over the internet
 #                          David Cooper &lt;david.cooper@oracle.com&gt; 
-obex		650/udp     # OBEX
-obex		650/tcp     # OBEX
-#			   Jeff Garbers &lt;FJG030@email.mot.com&gt;
-ieee-mms	651/udp     # IEEE MMS
-ieee-mms	651/tcp     # IEEE MMS
-#			   Curtis Anderson &lt;canderson@turbolinux.com&gt;
-hello-port	652/udp     # HELLO_PORT	
-hello-port	652/tcp     # HELLO_PORT
-#			   Patrick Cipiere &lt;Patrick.Cipiere@UDcast.com&gt;
-repscmd		653/udp     # RepCmd
-repscmd		653/tcp     # RepCmd
-#			   Scott Dale &lt;scott@tioga.com&gt;
-aodv		654/udp	    # AODV
-aodv		654/tcp	    # AODV
-#			   Charles Perkins &lt;cperkins@eng.sun.com&gt;
-tinc		655/udp     # TINC
-tinc		655/tcp     # TINC
-#			   Ivo Timmermans &lt;itimmermans@bigfoot.com&gt;
-spmp		656/udp     # SPMP
-spmp		656/tcp     # SPMP
-#			   Jakob Kaivo &lt;jkaivo@nodomainname.net&gt;
-rmc		657/udp     # RMC
-rmc		657/tcp     # RMC
-#			   Michael Schmidt &lt;mmaass@us.ibm.com&gt;
-tenfold		658/udp     # TenFold
-tenfold		658/tcp     # TenFold
-#			   Louis Olszyk &lt;lolszyk@10fold.com&gt;
+obex            650/udp     # OBEX
+obex            650/tcp     # OBEX
+#                          Jeff Garbers &lt;FJG030@email.mot.com&gt;
+ieee-mms        651/udp     # IEEE MMS
+ieee-mms        651/tcp     # IEEE MMS
+#                          Curtis Anderson &lt;canderson@turbolinux.com&gt;
+hello-port      652/udp     # HELLO_PORT
+hello-port      652/tcp     # HELLO_PORT
+#                          Patrick Cipiere &lt;Patrick.Cipiere@UDcast.com&gt;
+repscmd         653/udp     # RepCmd
+repscmd         653/tcp     # RepCmd
+#                          Scott Dale &lt;scott@tioga.com&gt;
+aodv            654/udp     # AODV
+aodv            654/tcp     # AODV
+#                          Charles Perkins &lt;cperkins@eng.sun.com&gt;
+tinc            655/udp     # TINC
+tinc            655/tcp     # TINC
+#                          Ivo Timmermans &lt;itimmermans@bigfoot.com&gt;
+spmp            656/udp     # SPMP
+spmp            656/tcp     # SPMP
+#                          Jakob Kaivo &lt;jkaivo@nodomainname.net&gt;
+rmc             657/udp     # RMC
+rmc             657/tcp     # RMC
+#                          Michael Schmidt &lt;mmaass@us.ibm.com&gt;
+tenfold         658/udp     # TenFold
+tenfold         658/tcp     # TenFold
+#                          Louis Olszyk &lt;lolszyk@10fold.com&gt;
 #               659        Removed (2001-06-06)
 mac-srvr-admin  660/udp     # MacOS Server Admin
 mac-srvr-admin  660/tcp     # MacOS Server Admin
@@ -1720,8 +1720,8 @@ asf-secure-rmcp 664/tcp     # ASF Secure Remote Management and Control Protocol
 sun-dr          665/udp     # Sun DR
 sun-dr          665/tcp     # Sun DR
 #                          Harinder Bhasin &lt;Harinder.Bhasin@Sun.COM&gt;
-mdqs            666/udp	 doom # 
-mdqs            666/tcp	 doom # 
+mdqs            666/udp  doom #
+mdqs            666/tcp  doom #
 #                          &lt;ddt@idcube.idsoftware.com&gt;
 disclose        667/udp     # campaign contribution disclosures - SDR Technologies
 disclose        667/tcp     # campaign contribution disclosures - SDR Technologies
@@ -1740,67 +1740,67 @@ vpps-qua        672/tcp     # VPPS-QUA
 cimplex         673/udp     # CIMPLEX
 cimplex         673/tcp     # CIMPLEX
 #                          Ulysses G. Smith Jr. &lt;ugsmith@cesi.com&gt;
-acap            674/udp	    # ACAP
+acap            674/udp     # ACAP
 acap            674/tcp     # ACAP
 #                          Chris Newman &lt;chris.newman@sun.com&gt;
-dctp		675/udp     # DCTP
-dctp		675/tcp     # DCTP
-#			   Andre Kramer &lt;Andre.Kramer@ansa.co.uk&gt;
-vpps-via	676/udp     # VPPS Via
-vpps-via	676/tcp     # VPPS Via
-#			   Ulysses G. Smith Jr. &lt;ugsmith@cesi.com&gt;
-vpp		677/udp     # Virtual Presence Protocol 
-vpp		677/tcp     # Virtual Presence Protocol 
-#			   Klaus Wolf &lt;wolf@cobrow.com&gt;
-ggf-ncp		678/udp     # GNU Generation Foundation NCP
-ggf-ncp		678/tcp     # GNU Generation Foundation NCP
-#			   Noah Paul &lt;noahp@altavista.net&gt;
-mrm		679/udp     # MRM
-mrm		679/tcp     # MRM
-#			   Liming Wei &lt;lwei@cisco.com&gt;
-entrust-aaas	680/udp     # entrust-aaas 
-entrust-aaas	680/tcp     # entrust-aaas 
-entrust-aams	681/udp     # entrust-aams
-entrust-aams	681/tcp     # entrust-aams
-#			   Adrian Mancini &lt;adrian.mancini@entrust.com&gt;
-xfr		682/udp     # XFR
-xfr		682/tcp     # XFR
-#			   Noah Paul &lt;noahp@ultranet.com&gt;
-corba-iiop	683/udp     # CORBA IIOP 
-corba-iiop	683/tcp     # CORBA IIOP 
-corba-iiop-ssl	684/udp     # CORBA IIOP SSL
-corba-iiop-ssl	684/tcp     # CORBA IIOP SSL
-#			   Henry Lowe &lt;lowe@omg.org&gt;
-mdc-portmapper	685/udp     # MDC Port Mapper
-mdc-portmapper	685/tcp     # MDC Port Mapper
-#			   Noah Paul &lt;noahp@altavista.net&gt;
-hcp-wismar	686/udp     # Hardware Control Protocol Wismar
-hcp-wismar	686/tcp     # Hardware Control Protocol Wismar
-#			   David Merchant &lt;d.f.merchant@livjm.ac.uk&gt;	
-asipregistry	687/udp     # asipregistry
-asipregistry	687/tcp     # asipregistry
-#			   Erik Sea &lt;sea@apple.com&gt;
-realm-rusd	688/udp     # REALM-RUSD
-realm-rusd	688/tcp     # REALM-RUSD
-#			   Jerry Knight &lt;jknight@realminfo.com&gt;
-nmap		689/udp     # NMAP
-nmap		689/tcp     # NMAP
-#			   Peter Dennis Bartok &lt;peter@novonyx.com&gt;
-vatp		690/udp     # VATP
-vatp		690/tcp     # VATP
-#			   Atica Software &lt;comercial@aticasoft.es&gt;
-msexch-routing	691/udp     # MS Exchange Routing
-msexch-routing	691/tcp     # MS Exchange Routing
-#			   David Lemson &lt;dlemson@microsoft.com&gt;
-hyperwave-isp	692/udp     # Hyperwave-ISP
-hyperwave-isp	692/tcp     # Hyperwave-ISP
-#			   Gerald Mesaric &lt;gmesaric@hyperwave.com&gt;
-connendp	693/udp     # connendp
-connendp	693/tcp     # connendp
-#			   Ronny Bremer &lt;rbremer@future-gate.com&gt;
-ha-cluster	694/udp     # ha-cluster
-ha-cluster	694/tcp     # ha-cluster
-#			   Alan Robertson &lt;alanr@unix.sh&gt;
+dctp            675/udp     # DCTP
+dctp            675/tcp     # DCTP
+#                          Andre Kramer &lt;Andre.Kramer@ansa.co.uk&gt;
+vpps-via        676/udp     # VPPS Via
+vpps-via        676/tcp     # VPPS Via
+#                          Ulysses G. Smith Jr. &lt;ugsmith@cesi.com&gt;
+vpp             677/udp     # Virtual Presence Protocol
+vpp             677/tcp     # Virtual Presence Protocol
+#                          Klaus Wolf &lt;wolf@cobrow.com&gt;
+ggf-ncp         678/udp     # GNU Generation Foundation NCP
+ggf-ncp         678/tcp     # GNU Generation Foundation NCP
+#                          Noah Paul &lt;noahp@altavista.net&gt;
+mrm             679/udp     # MRM
+mrm             679/tcp     # MRM
+#                          Liming Wei &lt;lwei@cisco.com&gt;
+entrust-aaas    680/udp     # entrust-aaas
+entrust-aaas    680/tcp     # entrust-aaas
+entrust-aams    681/udp     # entrust-aams
+entrust-aams    681/tcp     # entrust-aams
+#                          Adrian Mancini &lt;adrian.mancini@entrust.com&gt;
+xfr             682/udp     # XFR
+xfr             682/tcp     # XFR
+#                          Noah Paul &lt;noahp@ultranet.com&gt;
+corba-iiop      683/udp     # CORBA IIOP
+corba-iiop      683/tcp     # CORBA IIOP
+corba-iiop-ssl  684/udp     # CORBA IIOP SSL
+corba-iiop-ssl  684/tcp     # CORBA IIOP SSL
+#                          Henry Lowe &lt;lowe@omg.org&gt;
+mdc-portmapper  685/udp     # MDC Port Mapper
+mdc-portmapper  685/tcp     # MDC Port Mapper
+#                          Noah Paul &lt;noahp@altavista.net&gt;
+hcp-wismar      686/udp     # Hardware Control Protocol Wismar
+hcp-wismar      686/tcp     # Hardware Control Protocol Wismar
+#                          David Merchant &lt;d.f.merchant@livjm.ac.uk&gt;
+asipregistry    687/udp     # asipregistry
+asipregistry    687/tcp     # asipregistry
+#                          Erik Sea &lt;sea@apple.com&gt;
+realm-rusd      688/udp     # REALM-RUSD
+realm-rusd      688/tcp     # REALM-RUSD
+#                          Jerry Knight &lt;jknight@realminfo.com&gt;
+nmap            689/udp     # NMAP
+nmap            689/tcp     # NMAP
+#                          Peter Dennis Bartok &lt;peter@novonyx.com&gt;
+vatp            690/udp     # VATP
+vatp            690/tcp     # VATP
+#                          Atica Software &lt;comercial@aticasoft.es&gt;
+msexch-routing  691/udp     # MS Exchange Routing
+msexch-routing  691/tcp     # MS Exchange Routing
+#                          David Lemson &lt;dlemson@microsoft.com&gt;
+hyperwave-isp   692/udp     # Hyperwave-ISP
+hyperwave-isp   692/tcp     # Hyperwave-ISP
+#                          Gerald Mesaric &lt;gmesaric@hyperwave.com&gt;
+connendp        693/udp     # connendp
+connendp        693/tcp     # connendp
+#                          Ronny Bremer &lt;rbremer@future-gate.com&gt;
+ha-cluster      694/udp     # ha-cluster
+ha-cluster      694/tcp     # ha-cluster
+#                          Alan Robertson &lt;alanr@unix.sh&gt;
 ieee-mms-ssl    695/udp     # IEEE-MMS-SSL
 ieee-mms-ssl    695/tcp     # IEEE-MMS-SSL
 #                          Curtis Anderson &lt;ecanderson@turbolinux.com&gt; 
@@ -1817,26 +1817,26 @@ accessnetwork   699/udp     # Access Network
 accessnetwork   699/tcp     # Access Network
 #                          Yingchun Xu &lt;Yingchun_Xu@3com.com&gt;
 #               700-703    Unassigned
-elcsd	        704/udp     # errlog copy/server daemon
-elcsd	        704/tcp     # errlog copy/server daemon
-agentx		705/udp     # AgentX
-agentx	        705/tcp     # AgentX
-#			   Bob Natale &lt;natale@acec.com&gt;
+elcsd           704/udp     # errlog copy/server daemon
+elcsd           704/tcp     # errlog copy/server daemon
+agentx          705/udp     # AgentX
+agentx          705/tcp     # AgentX
+#                          Bob Natale &lt;natale@acec.com&gt;
 silc            706/udp     # SILC
-silc		706/tcp     # SILC
-#                          Pekka Riikonen &lt;priikone@poseidon.pspt.fi&gt;	
-borland-dsj	707/udp	    # Borland DSJ
-borland-dsj	707/tcp     # Borland DSJ
-#			   Gerg Cole &lt;gcole@corp.borland.com&gt;
-#		708        Unassigned
+silc            706/tcp     # SILC
+#                          Pekka Riikonen &lt;priikone@poseidon.pspt.fi&gt;
+borland-dsj     707/udp     # Borland DSJ
+borland-dsj     707/tcp     # Borland DSJ
+#                          Gerg Cole &lt;gcole@corp.borland.com&gt;
+#               708        Unassigned
 entrust-kmsh    709/udp     # Entrust Key Management Service Handler
 entrust-kmsh    709/tcp     # Entrust Key Management Service Handler
 entrust-ash     710/udp     # Entrust Administration Service Handler
 entrust-ash     710/tcp     # Entrust Administration Service Handler
 #                          Peter Whittaker &lt;pww@entrust.com&gt;
-cisco-tdp	711/udp     # Cisco TDP
-cisco-tdp	711/tcp     # Cisco TDP
-#			   Bruce Davie &lt;bsd@cisco.com&gt;
+cisco-tdp       711/udp     # Cisco TDP
+cisco-tdp       711/tcp     # Cisco TDP
+#                          Bruce Davie &lt;bsd@cisco.com&gt;
 #               712-728    Unassigned
 netviewdm1      729/udp     # IBM NetView DM/6000 Server/Client
 netviewdm1      729/tcp     # IBM NetView DM/6000 Server/Client
@@ -1865,83 +1865,83 @@ ris-cm          748/tcp     # Russell Info Sci Calendar Manager
 kerberos-adm    749/udp     # kerberos administration
 kerberos-adm    749/tcp     # kerberos administration
 loadav          750/udp kerberos-iv # 
-rfile 	        750/tcp # 
+rfile           750/tcp #
 #                          Martin Hamilton &lt;martin@mrrl.lut.as.uk&gt;
-pump	        751/udp # 
-pump	        751/tcp # 
-qrh	        752/udp # 
-qrh	        752/tcp # 
-rrh	        753/udp # 
-rrh    	        753/tcp # 
-tell	        754/udp	    # send
-tell	        754/tcp	    # send
+pump            751/udp #
+pump            751/tcp #
+qrh             752/udp #
+qrh             752/tcp #
+rrh             753/udp #
+rrh             753/tcp #
+tell            754/udp     # send
+tell            754/tcp     # send
 #                          Josyula R. Rao &lt;jrrao@watson.ibm.com&gt;
 #               755-756    Unassigned
-nlogin	        758/udp # 
-nlogin	        758/tcp # 
-con	        759/udp # 
-con	        759/tcp # 
-ns	        760/udp # 
-ns	        760/tcp # 
-rxe	        761/udp # 
-rxe	        761/tcp # 
-quotad	        762/udp # 
-quotad	        762/tcp # 
+nlogin          758/udp #
+nlogin          758/tcp #
+con             759/udp #
+con             759/tcp #
+ns              760/udp #
+ns              760/tcp #
+rxe             761/udp #
+rxe             761/tcp #
+quotad          762/udp #
+quotad          762/tcp #
 cycleserv       763/udp # 
 cycleserv       763/tcp # 
-omserv	        764/udp # 
-omserv	        764/tcp # 
-webster	        765/udp # 
-webster	        765/tcp # 
+omserv          764/udp #
+omserv          764/tcp #
+webster         765/udp #
+webster         765/tcp #
 #                          Josyula R. Rao &lt;jrrao@watson.ibm.com&gt;
 #               766        Unassigned
-phonebook       767/udp	    # phone
-phonebook       767/tcp	    # phone
+phonebook       767/udp     # phone
+phonebook       767/tcp     # phone
 #                          Josyula R. Rao &lt;jrrao@watson.ibm.com&gt;
 #               768        Unassigned
-vid	        769/udp # 
-vid	        769/tcp # 
+vid             769/udp #
+vid             769/tcp #
 cadlock         770/udp # 
 cadlock         770/tcp # 
-rtip 	        771/udp # 
-rtip 	        771/tcp # 
+rtip            771/udp #
+rtip            771/tcp #
 cycleserv2      772/udp # 
 cycleserv2      772/tcp # 
-notify	        773/udp # 
-submit	        773/tcp # 
+notify          773/udp #
+submit          773/tcp #
 acmaint_dbd     774/udp # 
-rpasswd	        774/tcp # 
-acmaint_transd	775/udp # 
-entomb	        775/tcp # 
+rpasswd         774/tcp #
+acmaint_transd  775/udp #
+entomb          775/tcp #
 wpages          776/udp # 
-wpages		776/tcp # 
+wpages          776/tcp #
 #                          Josyula R. Rao &lt;jrrao@watson.ibm.com&gt;
-multiling-http	777/udp     # Multiling HTTP
-multiling-http	777/tcp     # Multiling HTTP
-#			   Alejandro Bonet &lt;babel@ctv.es&gt;
-#		778-779    Unassigned
-wpgs		780/udp # 
-wpgs		780/tcp # 
+multiling-http  777/udp     # Multiling HTTP
+multiling-http  777/tcp     # Multiling HTTP
+#                          Alejandro Bonet &lt;babel@ctv.es&gt;
+#               778-779    Unassigned
+wpgs            780/udp #
+wpgs            780/tcp #
 #                          Josyula R. Rao &lt;jrrao@watson.ibm.com&gt;
 #               781-785    Unassigned
 #               786        Unassigned (Removed 2002-05-08)
 #               787        Unassigned (Removed 2002-10-08)
 #               788-799    Unassigned
-mdbs_daemon	800/udp	 # 
-mdbs_daemon	800/tcp	 # 
-device		801/udp # 
-device		801/tcp # 
-#		802-809    Unassigned
-fcp-udp		810/udp     # FCP Datagram
-fcp-udp		810/tcp     # FCP
-#			   Paul Whittemore &lt;paul@softarc.com&gt;
-#		811-827    Unassigned
-itm-mcell-s	828/udp     # itm-mcell-s
-itm-mcell-s	828/tcp     # itm-mcell-s
-#			   Miles O'Neal &lt;meo@us.itmasters.com&gt;
+mdbs_daemon     800/udp  #
+mdbs_daemon     800/tcp  #
+device          801/udp #
+device          801/tcp #
+#               802-809    Unassigned
+fcp-udp         810/udp     # FCP Datagram
+fcp-udp         810/tcp     # FCP
+#                          Paul Whittemore &lt;paul@softarc.com&gt;
+#               811-827    Unassigned
+itm-mcell-s     828/udp     # itm-mcell-s
+itm-mcell-s     828/tcp     # itm-mcell-s
+#                          Miles O'Neal &lt;meo@us.itmasters.com&gt;
 pkix-3-ca-ra    829/udp     # PKIX-3 CA/RA
-pkix-3-ca-ra	829/tcp     # PKIX-3 CA/RA
-#			   Carlisle Adams &lt;Cadams@entrust.com&gt;
+pkix-3-ca-ra    829/tcp     # PKIX-3 CA/RA
+#                          Carlisle Adams &lt;Cadams@entrust.com&gt;
 #               830-846    Unassigned
 dhcp-failover2  847/udp     # dhcp-failover 2
 dhcp-failover2  847/tcp     # dhcp-failover 2
@@ -1971,10 +1971,10 @@ accessbuilder   888/tcp     # AccessBuilder
 cddbp           888/tcp     # CD Database Protocol
 #                          Steve Scherf &lt;steve@moonsoft.com&gt;
 #
-#		889-899    Unassigned
+#               889-899    Unassigned
 omginitialrefs  900/udp     # OMG Initial Refs
 omginitialrefs  900/tcp     # OMG Initial Refs
-#			   Christian Callsen &lt;Christian.Callsen@eng.sun.com&gt;
+#                          Christian Callsen &lt;Christian.Callsen@eng.sun.com&gt;
 smpnameres      901/udp     # SMPNAMERES
 smpnameres      901/tcp     # SMPNAMERES
 #                          Leif Ekblad &lt;leif@rdos.net&gt;
@@ -1993,47 +1993,47 @@ apex-edge       913/udp     # APEX endpoint-relay service
 apex-edge       913/tcp     # APEX endpoint-relay service
 #                          [RFC3340]
 #               914-988    Unassigned
-ftps-data	989/udp     # ftp protocol, data, over TLS/SSL
-ftps-data	989/tcp     # ftp protocol, data, over TLS/SSL
-ftps		990/udp     # ftp protocol, control, over TLS/SSL
-ftps		990/tcp     # ftp protocol, control, over TLS/SSL
-#			   Christopher Allen &lt;ChristopherA@consensus.com&gt;
-nas		991/udp     # Netnews Administration System
-nas		991/tcp     # Netnews Administration System
-#			   Vera Heinau &lt;heinau@fu-berlin.de&gt;
-#			   Heiko Schlichting &lt;heiko@fu-berlin.de&gt;
-telnets		992/udp     # telnet protocol over TLS/SSL
-telnets		992/tcp     # telnet protocol over TLS/SSL
-imaps		993/udp     # imap4 protocol over TLS/SSL
-imaps		993/tcp     # imap4 protocol over TLS/SSL
-ircs		994/udp     # irc protocol over TLS/SSL
-ircs		994/tcp     # irc protocol over TLS/SSL
-#			   Christopher Allen &lt;ChristopherA@consensus.com&gt;
+ftps-data       989/udp     # ftp protocol, data, over TLS/SSL
+ftps-data       989/tcp     # ftp protocol, data, over TLS/SSL
+ftps            990/udp     # ftp protocol, control, over TLS/SSL
+ftps            990/tcp     # ftp protocol, control, over TLS/SSL
+#                          Christopher Allen &lt;ChristopherA@consensus.com&gt;
+nas             991/udp     # Netnews Administration System
+nas             991/tcp     # Netnews Administration System
+#                          Vera Heinau &lt;heinau@fu-berlin.de&gt;
+#                          Heiko Schlichting &lt;heiko@fu-berlin.de&gt;
+telnets         992/udp     # telnet protocol over TLS/SSL
+telnets         992/tcp     # telnet protocol over TLS/SSL
+imaps           993/udp     # imap4 protocol over TLS/SSL
+imaps           993/tcp     # imap4 protocol over TLS/SSL
+ircs            994/udp     # irc protocol over TLS/SSL
+ircs            994/tcp     # irc protocol over TLS/SSL
+#                          Christopher Allen &lt;ChristopherA@consensus.com&gt;
 pop3s           995/udp     # pop3 protocol over TLS/SSL (was spop3)
 pop3s           995/tcp     # pop3 protocol over TLS/SSL (was spop3)
 #                          Gordon Mangione &lt;gordm@microsoft.com&gt;
 vsinet          996/udp     # vsinet
 vsinet          996/tcp     # vsinet
 #                          Rob Juergens &lt;robj@vsi.com&gt;
-maitrd		997/udp # 
-maitrd		997/tcp # 
-puparp		998/udp # 
-busboy		998/tcp # 
-applix		999/udp	        puprouter # Applix ac
-garcon		999/tcp puprouter # 
-cadlock2	1000/udp # 
-cadlock2	1000/tcp # 
+maitrd          997/udp #
+maitrd          997/tcp #
+puparp          998/udp #
+busboy          998/tcp #
+applix          999/udp         puprouter # Applix ac
+garcon          999/tcp puprouter #
+cadlock2        1000/udp #
+cadlock2        1000/tcp #
 #               1001-1009      Unassigned
-#		1008/udp   Possibly used by Sun Solaris????
-surf		1010/udp        # surf
-surf		1010/tcp        # surf
-#			       Joseph Geer &lt;jgeer@peapod.com&gt;	 
-#		1011-1022      Reserved
-	        1023/udp        # Reserved
+#               1008/udp   Possibly used by Sun Solaris????
+surf            1010/udp        # surf
+surf            1010/tcp        # surf
+#                              Joseph Geer &lt;jgeer@peapod.com&gt;
+#               1011-1022      Reserved
+                1023/udp        # Reserved
                 1023/tcp        # Reserved
 #                              IANA &lt;iana@iana.org&gt;
                 1024/udp    # Reserved             
-                1024/tcp    # Reserved		
+                1024/tcp    # Reserved
 #                          IANA &lt;iana@iana.org&gt;
 #
 # REGISTERED PORT NUMBERS
@@ -2187,9 +2187,9 @@ ansoft-lm-1     1083/udp    # Anasoft License Manager
 ansoft-lm-1     1083/tcp    # Anasoft License Manager
 ansoft-lm-2     1084/udp    # Anasoft License Manager
 ansoft-lm-2     1084/tcp    # Anasoft License Manager
-webobjects	1085/udp    # Web Objects
-webobjects	1085/tcp    # Web Objects
-#			   Andy Belk &lt;abelk@apple.com&gt;
+webobjects      1085/udp    # Web Objects
+webobjects      1085/tcp    # Web Objects
+#                          Andy Belk &lt;abelk@apple.com&gt;
 cplscrambler-lg 1086/udp    # CPL Scrambler Logging
 cplscrambler-lg 1086/tcp    # CPL Scrambler Logging
 cplscrambler-in 1087/udp    # CPL Scrambler Internal 
@@ -2219,11 +2219,11 @@ nicelink        1095/tcp    # NICELink
 cnrprotocol     1096/udp    # Common Name Resolution Protocol
 cnrprotocol     1096/tcp    # Common Name Resolution Protocol
 #                          Michael Mealling &lt;michaelm@netsol.com&gt; 
-sunclustermgr	1097/udp    # Sun Cluster Manager
-sunclustermgr	1097/tcp    # Sun Cluster Manager
+sunclustermgr   1097/udp    # Sun Cluster Manager
+sunclustermgr   1097/tcp    # Sun Cluster Manager
 #                          Ashit Patel &lt;Ashit.Patel@eng.Sun.COM&gt;
-rmiactivation	1098/udp    # RMI Activation
-rmiactivation	1098/tcp    # RMI Activation
+rmiactivation   1098/udp    # RMI Activation
+rmiactivation   1098/tcp    # RMI Activation
 rmiregistry     1099/udp    # RMI Registry
 rmiregistry     1099/tcp    # RMI Registry
 #                          Mark Hodapp &lt;mark.hodapp@sun.com&gt;
@@ -2422,15 +2422,15 @@ search-agent    1234/tcp    # Infoseek Search Agent
 #                          Jackie Wu &lt;jackiew@infoseek.com&gt;
 mosaicsyssvc1   1235/udp    # mosaicsyssvc1
 mosaicsyssvc1   1235/tcp    # mosaicsyssvc1
-#                          Brian Matthews &lt;bmatthews@mosaicsystems.com&gt;	
+#                          Brian Matthews &lt;bmatthews@mosaicsystems.com&gt;
 bvcontrol       1236/udp    # bvcontrol
 bvcontrol       1236/tcp    # bvcontrol
 #                          Daniel J Walsh &lt;dwalsh@bindview.com&gt;
 tsdos390        1237/udp    # tsdos390
 tsdos390        1237/tcp    # tsdos390
 #                          Ben Pracht &lt;ben.pracht@tivoli.com&gt; 
-hacl-qs	        1238/udp    # hacl-qs
-hacl-qs	        1238/tcp    # hacl-qs
+hacl-qs         1238/udp    # hacl-qs
+hacl-qs         1238/tcp    # hacl-qs
 #                          Farid Faez &lt;farid_faez@hp.com&gt;
 nmsd            1239/udp    # NMSD
 nmsd            1239/tcp    # NMSD
@@ -2438,12 +2438,12 @@ nmsd            1239/tcp    # NMSD
 instantia       1240/udp    # Instantia
 instantia       1240/tcp    # Instantia
 #                          Ruth Slater &lt;ruth.slater@ideagen.co.uk&gt; 
-nessus	        1241/udp    # nessus
-nessus	        1241/tcp    # nessus
+nessus          1241/udp    # nessus
+nessus          1241/tcp    # nessus
 #                          Jordan Hrycaj &lt;jordan@mjh.teddy-net.com&gt;
 nmasoverip      1242/udp    # NMAS over IP
 nmasoverip      1242/tcp    # NMAS over IP
-#                          Hal Henderson &lt;hhenders@novell.com&gt;		
+#                          Hal Henderson &lt;hhenders@novell.com&gt;
 serialgateway   1243/udp    # SerialGateway
 serialgateway   1243/tcp    # SerialGateway
 #                          Stephen LaValley &lt;lavalley@lucent.com&gt;
@@ -2458,52 +2458,52 @@ payrouter       1246/tcp    # payrouter
 visionpyramid   1247/udp    # VisionPyramid
 visionpyramid   1247/tcp    # VisionPyramid
 #                          Gavin Hutchinson &lt;gavinh@visionlogistics.com&gt;
-hermes		1248/udp    # hermes
-hermes		1248/tcp    # hermes
+hermes          1248/udp    # hermes
+hermes          1248/tcp    # hermes
 #                          Not known
-mesavistaco	1249/udp    # Mesa Vista Co
-mesavistaco	1249/tcp    # Mesa Vista Co
+mesavistaco     1249/udp    # Mesa Vista Co
+mesavistaco     1249/tcp    # Mesa Vista Co
 #                          Rick LaBanca &lt;rel@mesasys.com&gt;
-swldy-sias	1250/udp    # swldy-sias
-swldy-sias	1250/tcp    # swldy-sias
+swldy-sias      1250/udp    # swldy-sias
+swldy-sias      1250/tcp    # swldy-sias
 #                          Peter E Williams &lt;peter.williams@smallworld-us.com&gt;
-servergraph	1251/udp    # servergraph
+servergraph     1251/udp    # servergraph
 servergraph     1251/tcp    # servergraph
 #                          Lindsay Morris &lt;lmorris@servergraph.com&gt;
 bspne-pcc       1252/udp    # bspne-pcc
-bspne-pcc	1252/tcp    # bspne-pcc
-q55-pcc		1253/udp    # q55-pcc
+bspne-pcc       1252/tcp    # bspne-pcc
+q55-pcc         1253/udp    # q55-pcc
 q55-pcc         1253/tcp    # q55-pcc
-#                          Prem Tirilok &lt;Prem.Tirilok@tellabs.com&gt;	
-de-noc		1254/udp    # de-noc
-de-noc		1254/tcp    # de-noc
+#                          Prem Tirilok &lt;Prem.Tirilok@tellabs.com&gt;
+de-noc          1254/udp    # de-noc
+de-noc          1254/tcp    # de-noc
 de-cache-query  1255/udp    # de-cache-query
 de-cache-query  1255/tcp    # de-cache-query
-de-server	1256/udp    # de-server
-de-server	1256/tcp    # de-server
-#			   Jeff Burdette &lt;support@digitalenvoy.net&gt;
-shockwave2	1257/udp    # Shockwave 2
+de-server       1256/udp    # de-server
+de-server       1256/tcp    # de-server
+#                          Jeff Burdette &lt;support@digitalenvoy.net&gt;
+shockwave2      1257/udp    # Shockwave 2
 shockwave2      1257/tcp    # Shockwave 2
-#			   Dave Simmons &lt;dsimmons@macromedia.com&gt;	
-opennl		1258/udp    # Open Network Library
-opennl		1258/tcp    # Open Network Library
-opennl-voice	1259/udp    # Open Network Library Voice
+#                          Dave Simmons &lt;dsimmons@macromedia.com&gt;
+opennl          1258/udp    # Open Network Library
+opennl          1258/tcp    # Open Network Library
+opennl-voice    1259/udp    # Open Network Library Voice
 opennl-voice    1259/tcp    # Open Network Library Voice
 #                          Phil Frisbie &lt;phil@hawksoft.com&gt; 
-ibm-ssd		1260/udp    # ibm-ssd
-ibm-ssd		1260/tcp    # ibm-ssd
-#			   Barry Whyte &lt;barry_whyte@uk.ibm.com&gt;
-mpshrsv		1261/udp    # mpshrsv
+ibm-ssd         1260/udp    # ibm-ssd
+ibm-ssd         1260/tcp    # ibm-ssd
+#                          Barry Whyte &lt;barry_whyte@uk.ibm.com&gt;
+mpshrsv         1261/udp    # mpshrsv
 mpshrsv         1261/tcp    # mpshrsv
 #                          Makoto Ikeyama &lt;ikeyama@ael.fujitsu.co.jp&gt;
 qnts-orb        1262/udp    # QNTS-ORB
-qnts-orb	1262/tcp    # QNTS-ORB
+qnts-orb        1262/tcp    # QNTS-ORB
 #                          Raghurama Bhat &lt;raghu@quintus.com&gt; 
-dka		1263/udp    # dka
-dka		1263/tcp    # dka
+dka             1263/udp    # dka
+dka             1263/tcp    # dka
 #                          Chris Griffin &lt;cgriffin@dka.com&gt;
 prat            1264/udp    # PRAT
-prat		1264/tcp    # PRAT
+prat            1264/tcp    # PRAT
 #                          Keith Wood &lt;keith.wood@epid.eurotherm.co.uk&gt; 
 dssiapi         1265/udp    # DSSIAPI
 dssiapi         1265/tcp    # DSSIAPI
@@ -2602,9 +2602,9 @@ lpcp            1298/tcp    # lpcp
 hp-sci          1299/udp    # hp-sci
 hp-sci          1299/tcp    # hp-sci
 #                          Kim Scott &lt;kims@cup.hp.com&gt;       
-h323hostcallsc	1300/udp    # H323 Host Call Secure
-h323hostcallsc	1300/tcp    # H323 Host Call Secure
-#			   Jim Toga &lt;jtoga@ideal.jf.intel.com&gt;
+h323hostcallsc  1300/udp    # H323 Host Call Secure
+h323hostcallsc  1300/tcp    # H323 Host Call Secure
+#                          Jim Toga &lt;jtoga@ideal.jf.intel.com&gt;
 ci3-software-1  1301/udp    # CI3-Software-1
 ci3-software-1  1301/tcp    # CI3-Software-1
 ci3-software-2  1302/udp    # CI3-Software-2
@@ -2617,7 +2617,7 @@ boomerang       1304/udp    # Boomerang
 boomerang       1304/tcp    # Boomerang
 #                          Bruce Lueckenhoff &lt;brucelu@cisco.com&gt;
 pe-mike         1305/udp    # pe-mike
-pe-mike	        1305/tcp    # pe-mike
+pe-mike         1305/tcp    # pe-mike
 #                          Stephen Hemminger &lt;shemminger@passedge.com&gt;
 re-conn-proto   1306/udp    # RE-Conn-Proto
 re-conn-proto   1306/tcp    # RE-Conn-Proto
@@ -2631,24 +2631,24 @@ odsi            1308/tcp    # Optical Domain Service Interconnect (ODSI)
 jtag-server     1309/udp    # JTAG server
 jtag-server     1309/tcp    # JTAG server
 #                          Andrew Draper &lt;adraper@altera.com&gt;
-husky		1310/udp    # Husky
-husky		1310/tcp    # Husky
-#			   Mark Zang &lt;mark@zang.com&gt;
-rxmon		1311/udp    # RxMon
-rxmon		1311/tcp    # RxMon
-#			   Javier Jiminez &lt;javier_l_jimenez@dell.com&gt;
-sti-envision	1312/udp    # STI Envision
-sti-envision	1312/tcp    # STI Envision
-#			   Don Stedman &lt;dones@stisystems.com&gt;
+husky           1310/udp    # Husky
+husky           1310/tcp    # Husky
+#                          Mark Zang &lt;mark@zang.com&gt;
+rxmon           1311/udp    # RxMon
+rxmon           1311/tcp    # RxMon
+#                          Javier Jiminez &lt;javier_l_jimenez@dell.com&gt;
+sti-envision    1312/udp    # STI Envision
+sti-envision    1312/tcp    # STI Envision
+#                          Don Stedman &lt;dones@stisystems.com&gt;
 bmc_patroldb    1313/udp    # BMC_PATROLDB
 bmc_patroldb    1313/tcp    # BMC_PATROLDB
 #                          Devon Shows &lt;Devon_Shows@crow.bmc.com&gt;
 pdps            1314/udp    # Photoscript Distributed Printing System
-pdps		1314/tcp    # Photoscript Distributed Printing System
-#			   Les Klein &lt;sgy@cix.compulink.co.uk&gt;
-els		1315/udp    # E.L.S., Event Listener Service
-els		1315/tcp    # E.L.S., Event Listener Service
-#			   Jim Cleppe &lt;clep13@cfer.com&gt;
+pdps            1314/tcp    # Photoscript Distributed Printing System
+#                          Les Klein &lt;sgy@cix.compulink.co.uk&gt;
+els             1315/udp    # E.L.S., Event Listener Service
+els             1315/tcp    # E.L.S., Event Listener Service
+#                          Jim Cleppe &lt;clep13@cfer.com&gt;
 exbit-escp      1316/udp    # Exbit-ESCP
 exbit-escp      1316/tcp    # Exbit-ESCP
 #                          Morten Christensen &lt;mjc@exbit.dk&gt;
@@ -2661,12 +2661,12 @@ krb5gatekeeper  1318/tcp    # krb5gatekeeper
 panja-icsp      1319/udp    # Panja-ICSP
 panja-icsp      1319/tcp    # Panja-ICSP
 #                          Ron Barber &lt;ron.barber@panja.com&gt;     
-panja-axbnet	1320/udp    # Panja-AXBNET
-panja-axbnet	1320/tcp    # Panja-AXBNET
-#			   Andrew van Wensen &lt;avanwensen@panja.com&gt;
-pip		1321/udp    # PIP
-pip		1321/tcp    # PIP
-#			   Gordon Mohr &lt;gojomo@usa.net&gt;
+panja-axbnet    1320/udp    # Panja-AXBNET
+panja-axbnet    1320/tcp    # Panja-AXBNET
+#                          Andrew van Wensen &lt;avanwensen@panja.com&gt;
+pip             1321/udp    # PIP
+pip             1321/tcp    # PIP
+#                          Gordon Mohr &lt;gojomo@usa.net&gt;
 novation        1322/udp    # Novation
 novation        1322/tcp    # Novation
 #                          Alan Dano &lt;wiseobject@yahoo.com&gt;
@@ -2706,11 +2706,11 @@ passwrd-policy  1333/tcp    # Password Policy
 writesrv        1334/udp    # writesrv
 writesrv        1334/tcp    # writesrv
 #                          Marvin Toungate &lt;toungate@austin.ibm.com&gt;   
-digital-notary	1335/udp    # Digital Notary Protocol
-digital-notary	1335/tcp    # Digital Notary Protocol
-#			   Wes Doonan
+digital-notary  1335/udp    # Digital Notary Protocol
+digital-notary  1335/tcp    # Digital Notary Protocol
+#                          Wes Doonan
 ischat          1336/udp    # Instant Service Chat
-ischat	        1336/tcp    # Instant Service Chat
+ischat          1336/tcp    # Instant Service Chat
 #                          Mike Clise &lt;mikec@instantservice.com&gt;
 menandmice-dns  1337/udp    # menandmice DNS
 menandmice-dns  1337/tcp    # menandmice DNS
@@ -2722,29 +2722,29 @@ kjtsiteserver   1339/udp    # kjtsiteserver
 kjtsiteserver   1339/tcp    # kjtsiteserver
 #                          Jason Aubain &lt;jaubain@kjt.com&gt;
 naap            1340/udp    # NAAP
-naap		1340/tcp    # NAAP
-#                          Henry Haverinen &lt;henry.haverinen@nokia.com&gt;	
-qubes		1341/udp    # QuBES
+naap            1340/tcp    # NAAP
+#                          Henry Haverinen &lt;henry.haverinen@nokia.com&gt;
+qubes           1341/udp    # QuBES
 qubes           1341/tcp    # QuBES
 #                          Eric Grange &lt;egrange@creative-it.net&gt; 
-esbroker	1342/udp    # ESBroker
-esbroker	1342/tcp    # ESBroker
+esbroker        1342/udp    # ESBroker
+esbroker        1342/tcp    # ESBroker
 #                          Alexander Medvinsky &lt;smedvinsky@gi.com&gt;
 re101           1343/udp    # re101
-re101		1343/tcp    # re101
+re101           1343/tcp    # re101
 #                          Doriano Blengino &lt;tecnico@xonelectronics.it&gt;
 icap            1344/udp    # ICAP
-icap		1344/tcp    # ICAP
+icap            1344/tcp    # ICAP
 #                          Jeremy Elson &lt;jelson@isi.edu&gt;
 vpjp            1345/udp    # VPJP
 vpjp            1345/tcp    # VPJP
 #                          Michael Collins &lt;UBMCollins@aol.com&gt;
 alta-ana-lm     1346/udp    # Alta Analytics License Manager 
 alta-ana-lm     1346/tcp    # Alta Analytics License Manager 
-bbn-mmc		1347/udp    # multi media conferencing
-bbn-mmc		1347/tcp    # multi media conferencing
-bbn-mmx		1348/udp    # multi media conferencing
-bbn-mmx		1348/tcp    # multi media conferencing
+bbn-mmc         1347/udp    # multi media conferencing
+bbn-mmc         1347/tcp    # multi media conferencing
+bbn-mmx         1348/udp    # multi media conferencing
+bbn-mmx         1348/tcp    # multi media conferencing
 sbook           1349/udp    # Registration Network Protocol       
 sbook           1349/tcp    # Registration Network Protocol       
 editbench       1350/udp    # Registration Network Protocol       
@@ -3235,8 +3235,8 @@ ricardo-lm      1522/tcp     # Ricardo North America License Manager
 cichild-lm      1523/udp     # cichild
 cichild-lm      1523/tcp     # cichild
 #                           Andy Burgess &lt;aab@cichlid.com&gt;
-ingreslock	1524/udp     # ingres
-ingreslock	1524/tcp     # ingres
+ingreslock      1524/udp     # ingres
+ingreslock      1524/tcp     # ingres
 orasrv          1525/udp     prospero-np # oracle
 orasrv          1525/tcp     prospero-np # oracle
 pdap-np         1526/udp     # Prospero Data Access Prot non-priv 
@@ -3456,8 +3456,8 @@ picknfs         1598/tcp     # picknfs
 simbaservices   1599/udp     # simbaservices
 simbaservices   1599/tcp     # simbaservices
 #                           Betsy Alexander +1 604-681-4549
-issd		1600/udp # 
-issd		1600/tcp # 
+issd            1600/udp #
+issd            1600/tcp #
 aas             1601/udp    # aas
 aas             1601/tcp    # aas
 #                          Bob Beard &lt;bobb@lachman.com&gt;
@@ -3528,31 +3528,31 @@ udp-sr-port     1624/tcp   # udp-sr-port
 svs-omagent     1625/udp   # svs-omagent
 svs-omagent     1625/tcp   # svs-omagent
 #                         Alberto Berlen &lt;aberlen@VNET.IBM.COM&gt;
-shockwave	1626/udp   # Shockwave
-shockwave	1626/tcp   # Shockwave
-#			  Sarah Allen &lt;sallen@macromedia.com&gt;
-t128-gateway	1627/udp   # T.128 Gateway
-t128-gateway	1627/tcp   # T.128 Gateway
-#			  Phil May &lt;pm@datcon.co.uk&gt;
-lontalk-norm	1628/udp   # LonTalk normal
-lontalk-norm	1628/tcp   # LonTalk normal
-lontalk-urgnt	1629/udp   # LonTalk urgent
-lontalk-urgnt	1629/tcp   # LonTalk urgent
-#			  Dan Wing &lt;dwing@cisco.com&gt;
-oraclenet8cman	1630/udp   # Oracle Net8 Cman
-oraclenet8cman	1630/tcp   # Oracle Net8 Cman
-#			  Tong-Ming Lee &lt;tmlee@us.oracle.com&gt;
-visitview	1631/udp   # Visit view 	
-visitview	1631/tcp   # Visit view 	
-#			  Tom Whittaker &lt;tomw@ssec.wisc.edu&gt;
-pammratc	1632/udp   # PAMMRATC
-pammratc	1632/tcp   # PAMMRATC
-pammrpc		1633/udp   # PAMMRPC
-pammrpc		1633/tcp   # PAMMRPC
-#			  John Britton &lt;johnb@peakaudio.com&gt;
-loaprobe	1634/udp   # Log On America Probe
-loaprobe	1634/tcp   # Log On America Probe
-#			  James Tavares, Log On America &lt;krontor@loa.com&gt; 
+shockwave       1626/udp   # Shockwave
+shockwave       1626/tcp   # Shockwave
+#                         Sarah Allen &lt;sallen@macromedia.com&gt;
+t128-gateway    1627/udp   # T.128 Gateway
+t128-gateway    1627/tcp   # T.128 Gateway
+#                         Phil May &lt;pm@datcon.co.uk&gt;
+lontalk-norm    1628/udp   # LonTalk normal
+lontalk-norm    1628/tcp   # LonTalk normal
+lontalk-urgnt   1629/udp   # LonTalk urgent
+lontalk-urgnt   1629/tcp   # LonTalk urgent
+#                         Dan Wing &lt;dwing@cisco.com&gt;
+oraclenet8cman  1630/udp   # Oracle Net8 Cman
+oraclenet8cman  1630/tcp   # Oracle Net8 Cman
+#                         Tong-Ming Lee &lt;tmlee@us.oracle.com&gt;
+visitview       1631/udp   # Visit view
+visitview       1631/tcp   # Visit view
+#                         Tom Whittaker &lt;tomw@ssec.wisc.edu&gt;
+pammratc        1632/udp   # PAMMRATC
+pammratc        1632/tcp   # PAMMRATC
+pammrpc         1633/udp   # PAMMRPC
+pammrpc         1633/tcp   # PAMMRPC
+#                         John Britton &lt;johnb@peakaudio.com&gt;
+loaprobe        1634/udp   # Log On America Probe
+loaprobe        1634/tcp   # Log On America Probe
+#                         James Tavares, Log On America &lt;krontor@loa.com&gt;
 edb-server1     1635/udp   # EDB Server 1
 edb-server1     1635/tcp   # EDB Server 1
 #                         Carlos Portela &lt;cportela@simple-sw.com&gt;
@@ -3594,8 +3594,8 @@ concurrent-lm   1648/tcp   # concurrent-lm
 kermit          1649/udp   # kermit 
 kermit          1649/tcp   # kermit
 #                         Frank da Cruz &lt;fdc@watsun.cc.columbia.edu&gt;
-nkd		1650/udp   # nkd
-nkd		1650/tcp   # nkdn
+nkd             1650/udp   # nkd
+nkd             1650/tcp   # nkdn
 shiva_confsrvr  1651/udp   # shiva_confsrvr
 shiva_confsrvr  1651/tcp   # shiva_confsrvr
 #                         Mike Horowitz &lt;mah@Shiva.COM&gt;
@@ -3672,8 +3672,8 @@ prolink         1678/tcp   # prolink
 darcorp-lm      1679/udp   # darcorp-lm
 darcorp-lm      1679/tcp   # darcorp-lm
 #                         &lt;DARcorp@aol.com&gt;
-microcom-sbp    1680/udp   # microcom-sbp	
-microcom-sbp    1680/tcp   # microcom-sbp	
+microcom-sbp    1680/udp   # microcom-sbp
+microcom-sbp    1680/tcp   # microcom-sbp
 #                         Boris B. Maiden &lt;Boris_Maiden@smtp.microcom.com&gt; 
 sd-elmd         1681/udp   # sd-elmd
 sd-elmd         1681/tcp   # sd-elmd
@@ -3948,8 +3948,8 @@ femis           1776/tcp     # Federal Emergency Management Information System
 powerguardian   1777/udp     # powerguardian
 powerguardian   1777/tcp     # powerguardian
 #                           Charles Bennett &lt;chuck@benatong.com&gt;
-prodigy-intrnet	1778/udp     # prodigy-internet
-prodigy-intrnet	1778/tcp     # prodigy-internet
+prodigy-intrnet 1778/udp     # prodigy-internet
+prodigy-intrnet 1778/tcp     # prodigy-internet
 #                           Bob Dedrick &lt;bob@staff.prodigy.com&gt;
 pharmasoft      1779/udp     # pharmasoft
 pharmasoft      1779/tcp     # pharmasoft
@@ -4010,43 +4010,43 @@ uma             1797/tcp     # UMA
 etp             1798/udp     # Event Transfer Protocol
 etp             1798/tcp     # Event Transfer Protocol
 #                           Mike Wray &lt;mjw@hplb.hpl.hp.com&gt;
-netrisk		1799/udp     # NETRISK
-netrisk		1799/tcp     # NETRISK
-#			    Kevin Green &lt;Kevin_Green@tds.com&gt;
-ansys-lm	1800/udp     # ANSYS-License manager
-ansys-lm	1800/tcp     # ANSYS-License manager
-#			    Suzanne Lorrin &lt;sml@ansyspo.ansys.com&gt;
-msmq		1801/udp     # Microsoft Message Que
-msmq		1801/tcp     # Microsoft Message Que
-#			    Amnon Horowitz &lt;amnonh@MICROSOFT.com&gt;
-concomp1	1802/udp     # ConComp1
-concomp1	1802/tcp     # ConComp1
-#			    Ed Vincent &lt;@edv@concomp.com&gt;
-hp-hcip-gwy	1803/udp     # HP-HCIP-GWY
-hp-hcip-gwy	1803/tcp     # HP-HCIP-GWY
-#			    Allen Baker &lt;abaker@boi.hp.com&gt;
-enl		1804/udp     # ENL
-enl		1804/tcp     # ENL
-#			    Brian Olson &lt;BOlson@veritas.com&gt;
-enl-name	1805/udp     # ENL-Name
-enl-name	1805/tcp     # ENL-Name
-#			    Brian Olson &lt;BOlson@veritas.com&gt;
-musiconline	1806/udp     # Musiconline
-musiconline	1806/tcp     # Musiconline
-#			    Craig Weeks &lt;cweeks@syspace.co.uk&gt;
-fhsp		1807/udp     # Fujitsu Hot Standby Protocol
-fhsp		1807/tcp     # Fujitsu Hot Standby Protocol
-#			    Eiki Iwata (eiki@nd.net.fujitsu.co.jp&gt;
-oracle-vp2	1808/udp     # Oracle-VP2
-oracle-vp2	1808/tcp     # Oracle-VP2
+netrisk         1799/udp     # NETRISK
+netrisk         1799/tcp     # NETRISK
+#                           Kevin Green &lt;Kevin_Green@tds.com&gt;
+ansys-lm        1800/udp     # ANSYS-License manager
+ansys-lm        1800/tcp     # ANSYS-License manager
+#                           Suzanne Lorrin &lt;sml@ansyspo.ansys.com&gt;
+msmq            1801/udp     # Microsoft Message Que
+msmq            1801/tcp     # Microsoft Message Que
+#                           Amnon Horowitz &lt;amnonh@MICROSOFT.com&gt;
+concomp1        1802/udp     # ConComp1
+concomp1        1802/tcp     # ConComp1
+#                           Ed Vincent &lt;@edv@concomp.com&gt;
+hp-hcip-gwy     1803/udp     # HP-HCIP-GWY
+hp-hcip-gwy     1803/tcp     # HP-HCIP-GWY
+#                           Allen Baker &lt;abaker@boi.hp.com&gt;
+enl             1804/udp     # ENL
+enl             1804/tcp     # ENL
+#                           Brian Olson &lt;BOlson@veritas.com&gt;
+enl-name        1805/udp     # ENL-Name
+enl-name        1805/tcp     # ENL-Name
+#                           Brian Olson &lt;BOlson@veritas.com&gt;
+musiconline     1806/udp     # Musiconline
+musiconline     1806/tcp     # Musiconline
+#                           Craig Weeks &lt;cweeks@syspace.co.uk&gt;
+fhsp            1807/udp     # Fujitsu Hot Standby Protocol
+fhsp            1807/tcp     # Fujitsu Hot Standby Protocol
+#                           Eiki Iwata (eiki@nd.net.fujitsu.co.jp&gt;
+oracle-vp2      1808/udp     # Oracle-VP2
+oracle-vp2      1808/tcp     # Oracle-VP2
 #                           Craig Fowler &lt;cfowler@us.oracle.com&gt;
-oracle-vp1	1809/udp     # Oracle-VP1
+oracle-vp1      1809/udp     # Oracle-VP1
 oracle-vp1      1809/tcp     # Oracle-VP1
 #                           Craig Fowler &lt;cfowler@us.oracle.com&gt;
-jerand-lm	1810/udp     # Jerand License Manager
+jerand-lm       1810/udp     # Jerand License Manager
 jerand-lm       1810/tcp     # Jerand License Manager
 #                           Robert Monat &lt;jerand@jerand.com&gt;
-scientia-sdb	1811/udp     # Scientia-SDB
+scientia-sdb    1811/udp     # Scientia-SDB
 scientia-sdb    1811/tcp     # Scientia-SDB
 #                           Ian Miller &lt;Ian_Miller@scientia.com&gt;
 radius          1812/udp     # RADIUS
@@ -4058,16 +4058,16 @@ radius-acct     1813/tcp     # RADIUS Accounting
 tdp-suite       1814/udp     # TDP Suite
 tdp-suite       1814/tcp     # TDP Suite
 #                           Rob Lockhart &lt;rob.lockhart@mot.com&gt;
-mmpft		1815/udp     # MMPFT
-mmpft		1815/tcp     # MMPFT
-#			    Ralf Muckenhirn &lt;FAX: 49-7622-398200&gt;
+mmpft           1815/udp     # MMPFT
+mmpft           1815/tcp     # MMPFT
+#                           Ralf Muckenhirn &lt;FAX: 49-7622-398200&gt;
 #                           &lt;Phone: 49-7622-3980&gt;
-harp		1816/udp     # HARP
-harp		1816/tcp     # HARP
-#			    Bjorn Chambless &lt;bjorn@cs.pdx.edu&gt;
-rkb-oscs	1817/udp     # RKB-OSCS
-rkb-oscs	1817/tcp     # RKB-OSCS
-#			    Robert Kevin Breton &lt;BOBBRETON@HOTMAIL.COM&gt;
+harp            1816/udp     # HARP
+harp            1816/tcp     # HARP
+#                           Bjorn Chambless &lt;bjorn@cs.pdx.edu&gt;
+rkb-oscs        1817/udp     # RKB-OSCS
+rkb-oscs        1817/tcp     # RKB-OSCS
+#                           Robert Kevin Breton &lt;BOBBRETON@HOTMAIL.COM&gt;
 etftp           1818/udp     # Enhanced Trivial File Transfer Protocol
 etftp           1818/tcp     # Enhanced Trivial File Transfer Protocol
 #                           William Polites &lt;wpolites@mitre.org&gt;
@@ -4089,61 +4089,61 @@ unisys-lm       1823/tcp     # Unisys Natural Language License Manager
 metrics-pas     1824/udp     # metrics-pas
 metrics-pas     1824/tcp     # metrics-pas
 #                           Tom Haapanen &lt;tomh@metrics.com&gt;
-direcpc-video	1825/udp     # DirecPC Video
-direcpc-video	1825/tcp     # DirecPC Video
-#			    Chris Kerrigan &lt;ckerrigan@hns.com&gt;    
-ardt		1826/udp     # ARDT
-ardt		1826/tcp     # ARDT
-#			    Mike Goddard &lt;mike.goddard@ardent.com.au&gt;
-asi		1827/udp     # ASI 
-asi		1827/tcp     # ASI 
-#			    Bob Tournoux &lt;bob.tournoux@usiny.mail.abb.com&gt;
-itm-mcell-u	1828/udp     # itm-mcell-u
-itm-mcell-u	1828/tcp     # itm-mcell-u
-#			    Miles O'Neal &lt;meo@us.itmasters.com&gt;
-optika-emedia	1829/udp     # Optika eMedia 
-optika-emedia	1829/tcp     # Optika eMedia 
-#			    Daryle DeBalski &lt;ddebalski@optika.com&gt;
-net8-cman	1830/udp     # Oracle Net8 CMan Admin
-net8-cman	1830/tcp     # Oracle Net8 CMan Admin
-#			    Shuvayu Kanjilal
-myrtle		1831/udp     # Myrtle
-myrtle		1831/tcp     # Myrtle
-#			    Ron Achin &lt;RAchin@genscan.com&gt;
-tht-treasure	1832/udp     # ThoughtTreasure
-tht-treasure	1832/tcp     # ThoughtTreasure
-#			    Erik Mueller &lt;erik@signiform.com&gt;
-udpradio	1833/udp     # udpradio
-udpradio	1833/tcp     # udpradio
-#			    Guus Sliepen &lt;guus@warande3094.warande.uu.nl&gt;
-ardusuni	1834/udp     # ARDUS Unicast
-ardusuni	1834/tcp     # ARDUS Unicast
-ardusmul	1835/udp     # ARDUS Multicast
-ardusmul	1835/tcp     # ARDUS Multicast
-#			    Toshikatsu Ito &lt;ito-t@pfu.co.jp&gt;
-ste-smsc	1836/udp     # ste-smsc
-ste-smsc	1836/tcp     # ste-smsc
-#			    Tom Snauwaert &lt;tom.snauwaert@st-electronics.be&gt;
-csoft1		1837/udp     # csoft1
-csoft1		1837/tcp     # csoft1
-#			    John Coll &lt;john@csoft.co.uk&gt; 
-talnet		1838/udp     # TALNET
-talnet		1838/tcp     # TALNET
-#			    Aaron Lav &lt;aaron@taltrade.com&gt;
-netopia-vo1	1839/udp     # netopia-vo1
-netopia-vo1	1839/tcp     # netopia-vo1
-netopia-vo2	1840/udp     # netopia-vo2
-netopia-vo2	1840/tcp     # netopia-vo2
-netopia-vo3	1841/udp     # netopia-vo3
-netopia-vo3	1841/tcp     # netopia-vo3
-netopia-vo4	1842/udp     # netopia-vo4
-netopia-vo4	1842/tcp     # netopia-vo4
-netopia-vo5	1843/udp     # netopia-vo5
-netopia-vo5	1843/tcp     # netopia-vo5
-#			    Marc Epard &lt;marc@netopia.com&gt;
-direcpc-dll	1844/udp     # DirecPC-DLL
-direcpc-dll	1844/tcp     # DirecPC-DLL
-#			    Chris Kerrigan &lt;ckerrigan@hns.com&gt;
+direcpc-video   1825/udp     # DirecPC Video
+direcpc-video   1825/tcp     # DirecPC Video
+#                           Chris Kerrigan &lt;ckerrigan@hns.com&gt;
+ardt            1826/udp     # ARDT
+ardt            1826/tcp     # ARDT
+#                           Mike Goddard &lt;mike.goddard@ardent.com.au&gt;
+asi             1827/udp     # ASI
+asi             1827/tcp     # ASI
+#                           Bob Tournoux &lt;bob.tournoux@usiny.mail.abb.com&gt;
+itm-mcell-u     1828/udp     # itm-mcell-u
+itm-mcell-u     1828/tcp     # itm-mcell-u
+#                           Miles O'Neal &lt;meo@us.itmasters.com&gt;
+optika-emedia   1829/udp     # Optika eMedia
+optika-emedia   1829/tcp     # Optika eMedia
+#                           Daryle DeBalski &lt;ddebalski@optika.com&gt;
+net8-cman       1830/udp     # Oracle Net8 CMan Admin
+net8-cman       1830/tcp     # Oracle Net8 CMan Admin
+#                           Shuvayu Kanjilal
+myrtle          1831/udp     # Myrtle
+myrtle          1831/tcp     # Myrtle
+#                           Ron Achin &lt;RAchin@genscan.com&gt;
+tht-treasure    1832/udp     # ThoughtTreasure
+tht-treasure    1832/tcp     # ThoughtTreasure
+#                           Erik Mueller &lt;erik@signiform.com&gt;
+udpradio        1833/udp     # udpradio
+udpradio        1833/tcp     # udpradio
+#                           Guus Sliepen &lt;guus@warande3094.warande.uu.nl&gt;
+ardusuni        1834/udp     # ARDUS Unicast
+ardusuni        1834/tcp     # ARDUS Unicast
+ardusmul        1835/udp     # ARDUS Multicast
+ardusmul        1835/tcp     # ARDUS Multicast
+#                           Toshikatsu Ito &lt;ito-t@pfu.co.jp&gt;
+ste-smsc        1836/udp     # ste-smsc
+ste-smsc        1836/tcp     # ste-smsc
+#                           Tom Snauwaert &lt;tom.snauwaert@st-electronics.be&gt;
+csoft1          1837/udp     # csoft1
+csoft1          1837/tcp     # csoft1
+#                           John Coll &lt;john@csoft.co.uk&gt;
+talnet          1838/udp     # TALNET
+talnet          1838/tcp     # TALNET
+#                           Aaron Lav &lt;aaron@taltrade.com&gt;
+netopia-vo1     1839/udp     # netopia-vo1
+netopia-vo1     1839/tcp     # netopia-vo1
+netopia-vo2     1840/udp     # netopia-vo2
+netopia-vo2     1840/tcp     # netopia-vo2
+netopia-vo3     1841/udp     # netopia-vo3
+netopia-vo3     1841/tcp     # netopia-vo3
+netopia-vo4     1842/udp     # netopia-vo4
+netopia-vo4     1842/tcp     # netopia-vo4
+netopia-vo5     1843/udp     # netopia-vo5
+netopia-vo5     1843/tcp     # netopia-vo5
+#                           Marc Epard &lt;marc@netopia.com&gt;
+direcpc-dll     1844/udp     # DirecPC-DLL
+direcpc-dll     1844/tcp     # DirecPC-DLL
+#                           Chris Kerrigan &lt;ckerrigan@hns.com&gt;
 altalink        1845/udp     # altalink
 altalink        1845/tcp     # altalink
 #                           Alberto Raydan &lt;alberto@altasol.com&gt;
@@ -4159,12 +4159,12 @@ fjdocdist       1848/tcp     # fjdocdist
 alpha-sms       1849/udp     # ALPHA-SMS
 alpha-sms       1849/tcp     # ALPHA-SMS
 #                           Benjamin Grimm &lt;bg@webnetix.de&gt; 
-gsi		1850/udp     # GSI
-gsi		1850/tcp     # GSI
-#			    William Mullaney &lt;mullanwi@usa.net&gt;
-ctcd		1851/udp     # ctcd
-ctcd		1851/tcp     # ctcd
-#			    John Ryan &lt;john@cybertrace.com&gt;
+gsi             1850/udp     # GSI
+gsi             1850/tcp     # GSI
+#                           William Mullaney &lt;mullanwi@usa.net&gt;
+ctcd            1851/udp     # ctcd
+ctcd            1851/tcp     # ctcd
+#                           John Ryan &lt;john@cybertrace.com&gt;
 virtual-time    1852/udp     # Virtual Time
 virtual-time    1852/tcp     # Virtual Time
 #                           Angie S. Morner &lt;webmaster@dsbcpas.com&gt;
@@ -4188,24 +4188,24 @@ privateark      1858/tcp     # PrivateArk
 gammafetchsvr   1859/udp     # Gamma Fetcher Server
 gammafetchsvr   1859/tcp     # Gamma Fetcher Server
 #                           Cnaan Aviv &lt;cnaan@gammasite.com&gt;     
-sunscalar-svc	1860/udp     # SunSCALAR Services
-sunscalar-svc	1860/tcp     # SunSCALAR Services
-#			    Sanjay Radia &lt;srradia@kasumbi.Eng.Sun.COM&gt;
-lecroy-vicp	1861/udp     # LeCroy VICP
-lecroy-vicp	1861/tcp     # LeCroy VICP
-#			    Anthony Cake &lt;anthonyrc@lecroy.com&gt;
-techra-server	1862/udp     # techra-server
-techra-server	1862/tcp     # techra-server
-#			    Roy Lyseng &lt;roy.lyseng@maxware.no&gt;
-msnp		1863/udp     # MSNP
-msnp		1863/tcp     # MSNP
-#			    William Lai &lt;wlai@microsoft.com&gt;
-paradym-31port	1864/udp     # Paradym 31 Port
-paradym-31port	1864/tcp     # Paradym 31 Port
-#			    David Wooden &lt;dwooden@wizdom.com&gt;
-entp		1865/udp     # ENTP
-entp		1865/tcp     # ENTP
-#			    Seiko Epson &lt;Ishida.Hitoshi@exc.epson.co.jp&gt;
+sunscalar-svc   1860/udp     # SunSCALAR Services
+sunscalar-svc   1860/tcp     # SunSCALAR Services
+#                           Sanjay Radia &lt;srradia@kasumbi.Eng.Sun.COM&gt;
+lecroy-vicp     1861/udp     # LeCroy VICP
+lecroy-vicp     1861/tcp     # LeCroy VICP
+#                           Anthony Cake &lt;anthonyrc@lecroy.com&gt;
+techra-server   1862/udp     # techra-server
+techra-server   1862/tcp     # techra-server
+#                           Roy Lyseng &lt;roy.lyseng@maxware.no&gt;
+msnp            1863/udp     # MSNP
+msnp            1863/tcp     # MSNP
+#                           William Lai &lt;wlai@microsoft.com&gt;
+paradym-31port  1864/udp     # Paradym 31 Port
+paradym-31port  1864/tcp     # Paradym 31 Port
+#                           David Wooden &lt;dwooden@wizdom.com&gt;
+entp            1865/udp     # ENTP
+entp            1865/tcp     # ENTP
+#                           Seiko Epson &lt;Ishida.Hitoshi@exc.epson.co.jp&gt;
 swrmi           1866/udp     # swrmi
 swrmi           1866/tcp     # swrmi
 #                           Jun Yoshii &lt;yoshii@ael.fujitsu.co.jp&gt; 
@@ -4218,19 +4218,19 @@ viziblebrowser  1868/tcp     # VizibleBrowser
 yestrader       1869/udp     # YesTrader
 yestrader       1869/tcp     # YesTrader
 #                           Robert Bryan &lt;bbryan@yestrader.com&gt; 
-sunscalar-dns	1870/udp     # SunSCALAR DNS Service
+sunscalar-dns   1870/udp     # SunSCALAR DNS Service
 sunscalar-dns   1870/tcp     # SunSCALAR DNS Service
 #                           Sanjay Radia &lt;srradia@kasumbi.Eng.Sun.COM&gt;
-canocentral0	1871/udp     # Cano Central 0
-canocentral0	1871/tcp     # Cano Central 0
-canocentral1	1872/udp     # Cano Central 1
-canocentral1	1872/tcp     # Cano Central 1
-#			    Mark McNamara &lt;markm@research.canon.com.au&gt;
-fjmpjps		1873/udp     # Fjmpjps
-fjmpjps		1873/tcp     # Fjmpjps
-fjswapsnp	1874/udp     # Fjswapsnp
-fjswapsnp	1874/tcp     # Fjswapsnp
-#			    Y. Ohiwa &lt;y-ohiwa@ael.fujitsu.co.jp&gt;
+canocentral0    1871/udp     # Cano Central 0
+canocentral0    1871/tcp     # Cano Central 0
+canocentral1    1872/udp     # Cano Central 1
+canocentral1    1872/tcp     # Cano Central 1
+#                           Mark McNamara &lt;markm@research.canon.com.au&gt;
+fjmpjps         1873/udp     # Fjmpjps
+fjmpjps         1873/tcp     # Fjmpjps
+fjswapsnp       1874/udp     # Fjswapsnp
+fjswapsnp       1874/tcp     # Fjswapsnp
+#                           Y. Ohiwa &lt;y-ohiwa@ael.fujitsu.co.jp&gt;
 westell-stats   1875/udp     # westell stats
 westell-stats   1875/tcp     # westell stats
 #                           Thomas McCabe &lt;tmcca@westell.com&gt;
@@ -4249,8 +4249,8 @@ nettgain-nms    1879/tcp     # NettGain NMS
 vsat-control    1880/udp     # Gilat VSAT Control
 vsat-control    1880/tcp     # Gilat VSAT Control
 #                           Yariv Kaplan &lt;yarivk@gilat.com&gt; 
-ibm-mqseries2	1881/udp     # IBM WebSphere MQ
-ibm-mqseries2	1881/tcp     # IBM WebSphere MQ
+ibm-mqseries2   1881/udp     # IBM WebSphere MQ
+ibm-mqseries2   1881/tcp     # IBM WebSphere MQ
 #                           Richard Maxwell &lt;richard_maxwell@uk.ibm.com&gt;
 ecsqdmn         1882/udp     # ecsqdmn
 ecsqdmn         1882/tcp     # ecsqdmn
@@ -4280,16 +4280,16 @@ wilkenlistener  1890/udp     # wilkenListener
 wilkenlistener  1890/tcp     # wilkenListener
 #                           Wilken GmbH &lt;fy@wilken.de&gt; 
 childkey-notif  1891/udp     # ChildKey Notification
-childkey-notif	1891/tcp     # ChildKey Notification
-childkey-ctrl   1892/udp     # ChildKey Control 	
+childkey-notif  1891/tcp     # ChildKey Notification
+childkey-ctrl   1892/udp     # ChildKey Control
 childkey-ctrl   1892/tcp     # ChildKey Control
 #                           Ivan Berardinelli &lt;ivan@gestweb.com&gt;
 elad            1893/udp     # ELAD Protocol
 elad            1893/tcp     # ELAD Protocol
 #                           Franco Milan &lt;franco@eladit.com&gt;
 o2server-port   1894/udp     # O2Server Port
-o2server-port	1894/tcp     # O2Server Port
-#                           Tim Howard &lt;timothygh@hotmail.com&gt; 	
+o2server-port   1894/tcp     # O2Server Port
+#                           Tim Howard &lt;timothygh@hotmail.com&gt;
 #####  Microsoft (unoffically) using 1895     #####  
 b-novative-ls   1896/udp     # b-novative license server
 b-novative-ls   1896/tcp     # b-novative license server
@@ -4298,14 +4298,14 @@ metaagent       1897/udp     # MetaAgent
 metaagent       1897/tcp     # MetaAgent
 #                           Stephane Vinsot &lt;vinsot@enatel.com&gt;
 cymtec-port     1898/udp     # Cymtec secure management
-cymtec-port	1898/tcp     # Cymtec secure management
+cymtec-port     1898/tcp     # Cymtec secure management
 #                           Michael Mester &lt;mmester@cymtec.com&gt;
-mc2studios	1899/udp     # MC2Studios
-mc2studios	1899/tcp     # MC2Studios
-#			    Michael Coon &lt;michael@thecube.com&gt;	
-ssdp		1900/udp     # SSDP
-ssdp		1900/tcp     # SSDP
-#			    Yaron Goland &lt;yarong@microsoft.com&gt;
+mc2studios      1899/udp     # MC2Studios
+mc2studios      1899/tcp     # MC2Studios
+#                           Michael Coon &lt;michael@thecube.com&gt;
+ssdp            1900/udp     # SSDP
+ssdp            1900/tcp     # SSDP
+#                           Yaron Goland &lt;yarong@microsoft.com&gt;
 fjicl-tep-a     1901/udp     # Fujitsu ICL Terminal Emulator Program A
 fjicl-tep-a     1901/tcp     # Fujitsu ICL Terminal Emulator Program A
 #                           Bob Lyon &lt;bl@oasis.icl.co.uk&gt;
@@ -4319,29 +4319,29 @@ fjicl-tep-c     1904/udp     # Fujitsu ICL Terminal Emulator Program C
 fjicl-tep-c     1904/tcp     # Fujitsu ICL Terminal Emulator Program C
 #                           Bob Lyon &lt;bl@oasis.icl.co.uk&gt;
 sugp            1905/udp     # Secure UP.Link Gateway Protocol
-sugp   		1905/tcp     # Secure UP.Link Gateway Protocol
-#			    Peter King &lt;king@uplanet.com&gt;
-tpmd		1906/udp     # TPortMapperReq
-tpmd		1906/tcp     # TPortMapperReq
-# 			    Sheila Devins &lt;sheila_devins@VNET.IBM.COM&gt;
-intrastar	1907/udp     # IntraSTAR
-intrastar	1907/tcp     # IntraSTAR
-#			    Peter Schoenberger &lt;ps@teles.de&gt;
-dawn		1908/udp     # Dawn
-dawn		1908/tcp     # Dawn
-#			    Michael Crawford &lt;michaelc@travsoft.com&gt;
-global-wlink	1909/udp     # Global World Link
-global-wlink	1909/tcp     # Global World Link
-#			    Nicholas Davies &lt;N.Davies@globalcomm.co.uk&gt;
+sugp            1905/tcp     # Secure UP.Link Gateway Protocol
+#                           Peter King &lt;king@uplanet.com&gt;
+tpmd            1906/udp     # TPortMapperReq
+tpmd            1906/tcp     # TPortMapperReq
+#                           Sheila Devins &lt;sheila_devins@VNET.IBM.COM&gt;
+intrastar       1907/udp     # IntraSTAR
+intrastar       1907/tcp     # IntraSTAR
+#                           Peter Schoenberger &lt;ps@teles.de&gt;
+dawn            1908/udp     # Dawn
+dawn            1908/tcp     # Dawn
+#                           Michael Crawford &lt;michaelc@travsoft.com&gt;
+global-wlink    1909/udp     # Global World Link
+global-wlink    1909/tcp     # Global World Link
+#                           Nicholas Davies &lt;N.Davies@globalcomm.co.uk&gt;
 ultrabac        1910/udp     # UltraBac Software communications port
 ultrabac        1910/tcp     # UltraBac Software communications port
-#                           Paul Bunn &lt;iana@ultrabac.com&gt;	
+#                           Paul Bunn &lt;iana@ultrabac.com&gt;
 mtp             1911/udp     # Starlight Networks Multimedia Transport Protocol
 mtp             1911/tcp     # Starlight Networks Multimedia Transport Protocol
 #                           Bruce Lieberman &lt;brucel@iserver.starlight.com&gt;
-rhp-iibp	1912/udp     # rhp-iibp	
-rhp-iibp	1912/tcp     # rhp-iibp	
-#			    George Nachman
+rhp-iibp        1912/udp     # rhp-iibp
+rhp-iibp        1912/tcp     # rhp-iibp
+#                           George Nachman
 #                           Tom Lake &lt;tlake@m-ware.com&gt;
 armadp          1913/udp     # armadp
 armadp          1913/tcp     # armadp
@@ -4355,28 +4355,28 @@ facelink        1915/tcp     # FACELINK
 persona         1916/udp     # Persoft Persona
 persona         1916/tcp     # Persoft Persona
 #                           Tom Spidell &lt;spidell@persoft.com&gt;
-noagent		1917/udp     # nOAgent
-noagent		1917/tcp     # nOAgent
-#			    Martin Bestmann &lt;martin@datawatch.de&gt;
-can-nds		1918/udp     # Candle Directory Service - NDS
-can-nds   	1918/tcp     # Candle Directory Service - NDS    
-can-dch   	1919/udp     # Candle Directory Service - DCH
-can-dch		1919/tcp     # Candle Directory Service - DCH
-can-ferret	1920/udp     # Candle Directory Service - FERRET
-can-ferret	1920/tcp     # Candle Directory Service - FERRET
-#			    Dannis Yang &lt;Dannis_Yang@candle.com&gt;
-noadmin		1921/udp     # NoAdmin
-noadmin		1921/tcp     # NoAdmin
-#			    Martin Bestmann &lt;martin@datawatch.de&gt;
-tapestry	1922/udp     # Tapestry	
-tapestry	1922/tcp     # Tapestry	
-#			    Ken Oliver &lt;koliver@anritsu.com&gt;
-spice		1923/udp     # SPICE
-spice		1923/tcp     # SPICE
-#			    Nicholas Chua &lt;nick@sendit.se&gt;
-xiip		1924/udp     # XIIP
-xiip		1924/tcp     # XIIP
-#			    Alain Robert &lt;Alain.Robert@HMRinc.com&gt;	
+noagent         1917/udp     # nOAgent
+noagent         1917/tcp     # nOAgent
+#                           Martin Bestmann &lt;martin@datawatch.de&gt;
+can-nds         1918/udp     # Candle Directory Service - NDS
+can-nds         1918/tcp     # Candle Directory Service - NDS
+can-dch         1919/udp     # Candle Directory Service - DCH
+can-dch         1919/tcp     # Candle Directory Service - DCH
+can-ferret      1920/udp     # Candle Directory Service - FERRET
+can-ferret      1920/tcp     # Candle Directory Service - FERRET
+#                           Dannis Yang &lt;Dannis_Yang@candle.com&gt;
+noadmin         1921/udp     # NoAdmin
+noadmin         1921/tcp     # NoAdmin
+#                           Martin Bestmann &lt;martin@datawatch.de&gt;
+tapestry        1922/udp     # Tapestry
+tapestry        1922/tcp     # Tapestry
+#                           Ken Oliver &lt;koliver@anritsu.com&gt;
+spice           1923/udp     # SPICE
+spice           1923/tcp     # SPICE
+#                           Nicholas Chua &lt;nick@sendit.se&gt;
+xiip            1924/udp     # XIIP
+xiip            1924/tcp     # XIIP
+#                           Alain Robert &lt;Alain.Robert@HMRinc.com&gt;
 discovery-port  1925/udp     # Surrogate Discovery Port
 discovery-port  1925/tcp     # Surrogate Discovery Port
 #                           Keith Thompson &lt;keith.thompson@sun.com&gt;
@@ -4392,18 +4392,18 @@ emsd-port       1928/tcp     # Expnd Maui Srvr Dscovr
 bandwiz-system  1929/udp     # Bandwiz System - Server
 bandwiz-system  1929/tcp     # Bandwiz System - Server
 #                           Joseph Weihs &lt;yossi@bandwiz.com&gt;
-driveappserver	1930/udp     # Drive AppServer
-driveappserver	1930/tcp     # Drive AppServer
-#			    Andrew Johnson
-#			    &lt;andrew.johnson@bliss-support.demon.co.uk&gt;
-amdsched	1931/udp     # AMD SCHED
-amdsched	1931/tcp     # AMD SCHED
-#			    Michael Walsh &lt;mww@warwick.net&gt;
+driveappserver  1930/udp     # Drive AppServer
+driveappserver  1930/tcp     # Drive AppServer
+#                           Andrew Johnson
+#                           &lt;andrew.johnson@bliss-support.demon.co.uk&gt;
+amdsched        1931/udp     # AMD SCHED
+amdsched        1931/tcp     # AMD SCHED
+#                           Michael Walsh &lt;mww@warwick.net&gt;
 ctt-broker      1932/udp     # CTT Broker
 ctt-broker      1932/tcp     # CTT Broker
 #                           Jens Edlund &lt;edlund@speech.kth.se&gt;
 xmapi           1933/udp     # IBM LM MT Agent
-xmapi		1933/tcp     # IBM LM MT Agent
+xmapi           1933/tcp     # IBM LM MT Agent
 xaapi           1934/udp     # IBM LM Appl Agent
 xaapi           1934/tcp     # IBM LM Appl Agent
 #                           Helga Wolin &lt;hwolin@us.ibm.com&gt;
@@ -4453,12 +4453,12 @@ ismaeasdaqtest  1950/tcp     # ISMA Easdaq Test
 bcs-lmserver    1951/udp     # bcs-lmserver
 bcs-lmserver    1951/tcp     # bcs-lmserver
 #                           Andy Warner &lt;andyw@knoware.nl&gt;
-mpnjsc		1952/udp     # mpnjsc
-mpnjsc		1952/tcp     # mpnjsc
-#			    Takenori Miyahara &lt;miyahara@pfu.co.jp&gt;	
-rapidbase	1953/udp     # Rapid Base
-rapidbase	1953/tcp     # Rapid Base
-#			    Antoni Wolski &lt;antoni.wolski@vtt.fi&gt;
+mpnjsc          1952/udp     # mpnjsc
+mpnjsc          1952/tcp     # mpnjsc
+#                           Takenori Miyahara &lt;miyahara@pfu.co.jp&gt;
+rapidbase       1953/udp     # Rapid Base
+rapidbase       1953/tcp     # Rapid Base
+#                           Antoni Wolski &lt;antoni.wolski@vtt.fi&gt;
 abr-basic       1954/udp     # ABR-Basic Data
 abr-basic       1954/tcp     # ABR-Basic Data
 abr-secure      1955/udp     # ABR-Secure Data
@@ -4479,27 +4479,27 @@ simp-all        1959/tcp     # SIMP Channel
 nasmanager      1960/udp     # Merit DAC NASmanager
 nasmanager      1960/tcp     # Merit DAC NASmanager
 #                           Richard S. Conto &lt;rsc@merit.edu&gt;
-bts-appserver	1961/udp    # BTS APPSERVER
-bts-appserver	1961/tcp    # BTS APPSERVER
-#			   Carl Obsorn &lt;carl_osborn@sabre.com&gt;
+bts-appserver   1961/udp    # BTS APPSERVER
+bts-appserver   1961/tcp    # BTS APPSERVER
+#                          Carl Obsorn &lt;carl_osborn@sabre.com&gt;
 biap-mp         1962/udp    # BIAP-MP
 biap-mp         1962/tcp    # BIAP-MP
 #                          Chuck Shotton &lt;cshotton@biap.com&gt;  
 webmachine      1963/udp    # WebMachine
 webmachine      1963/tcp    # WebMachine
 #                          Tim Jowers &lt;Tim.Jowers@ColumbiaSC.NCR.com&gt;
-solid-e-engine	1964/udp    # SOLID E ENGINE
-solid-e-engine	1964/tcp    # SOLID E ENGINE
-#			   Ari Valtanen &lt;ari.valtanen@solidtech.com&gt;
-tivoli-npm	1965/udp    # Tivoli NPM
-tivoli-npm	1965/tcp    # Tivoli NPM
-#			   Ivana Cuozzo &lt;Ivana.Cuozzo@tivoli.com&gt;
-slush		1966/udp    # Slush
-slush		1966/tcp    # Slush
-#			   Damien Miller &lt;damien@ibs.com.au&gt;
-sns-quote	1967/udp    # SNS Quote
-sns-quote	1967/tcp    # SNS Quote
-#			   Robert Ellman &lt;rellman@calicotech.com&gt;
+solid-e-engine  1964/udp    # SOLID E ENGINE
+solid-e-engine  1964/tcp    # SOLID E ENGINE
+#                          Ari Valtanen &lt;ari.valtanen@solidtech.com&gt;
+tivoli-npm      1965/udp    # Tivoli NPM
+tivoli-npm      1965/tcp    # Tivoli NPM
+#                          Ivana Cuozzo &lt;Ivana.Cuozzo@tivoli.com&gt;
+slush           1966/udp    # Slush
+slush           1966/tcp    # Slush
+#                          Damien Miller &lt;damien@ibs.com.au&gt;
+sns-quote       1967/udp    # SNS Quote
+sns-quote       1967/tcp    # SNS Quote
+#                          Robert Ellman &lt;rellman@calicotech.com&gt;
 lipsinc         1968/udp    # LIPSinc
 lipsinc         1968/tcp    # LIPSinc
 lipsinc1        1969/udp    # LIPSinc 1
@@ -4510,27 +4510,27 @@ netop-rc        1970/tcp    # NetOp Remote Control
 netop-school    1971/udp    # NetOp School
 netop-school    1971/tcp    # NetOp School
 #                          NetOp Technical Support &lt;support@danware.dk&gt;
-intersys-cache	1972/udp    # Cache
-intersys-cache	1972/tcp    # Cache
-#			   Mark Hanson &lt;markh@intersys.com&gt;
+intersys-cache  1972/udp    # Cache
+intersys-cache  1972/tcp    # Cache
+#                          Mark Hanson &lt;markh@intersys.com&gt;
 dlsrap          1973/udp    # Data Link Switching Remote Access Protocol
 dlsrap          1973/tcp    # Data Link Switching Remote Access Protocol
 #                          Steve T. Chiang &lt;schiang@cisco.com&gt;
-drp		1974/udp    # DRP
-drp		1974/tcp    # DRP
-#			   Richard Alan Johnson &lt;raj@cisco.com&gt;
-tcoflashagent	1975/udp    # TCO Flash Agent
-tcoflashagent	1975/tcp    # TCO Flash Agent
-tcoregagent	1976/udp    # TCO Reg Agent 
-tcoregagent	1976/tcp    # TCO Reg Agent 
-tcoaddressbook	1977/udp    # TCO Address Book
-tcoaddressbook	1977/tcp    # TCO Address Book
-#			   Allan Panitch &lt;allanp@tcosoft.com&gt;
-unisql		1978/udp    # UniSQL
-unisql		1978/tcp    # UniSQL
-unisql-java	1979/udp    # UniSQL Java
-unisql-java	1979/tcp    # UniSQL Java
-#			   Keith Yarbrough &lt;kyarbro@windtraveller.com&gt;
+drp             1974/udp    # DRP
+drp             1974/tcp    # DRP
+#                          Richard Alan Johnson &lt;raj@cisco.com&gt;
+tcoflashagent   1975/udp    # TCO Flash Agent
+tcoflashagent   1975/tcp    # TCO Flash Agent
+tcoregagent     1976/udp    # TCO Reg Agent
+tcoregagent     1976/tcp    # TCO Reg Agent
+tcoaddressbook  1977/udp    # TCO Address Book
+tcoaddressbook  1977/tcp    # TCO Address Book
+#                          Allan Panitch &lt;allanp@tcosoft.com&gt;
+unisql          1978/udp    # UniSQL
+unisql          1978/tcp    # UniSQL
+unisql-java     1979/udp    # UniSQL Java
+unisql-java     1979/tcp    # UniSQL Java
+#                          Keith Yarbrough &lt;kyarbro@windtraveller.com&gt;
 pearldoc-xact   1980/udp    # PearlDoc XACT
 pearldoc-xact   1980/tcp    # PearlDoc XACT
 #                          Chris Vertonghen &lt;chrisv@pearldoc.com&gt;
@@ -4543,12 +4543,12 @@ estamp          1982/tcp    # Evidentiary Timestamp
 lhtp            1983/udp    # Loophole Test Protocol
 lhtp            1983/tcp    # Loophole Test Protocol
 #                          Kade Hansson &lt;kade_fh@postoffice.utas.edu.au&gt;
-bb		1984/udp    # BB
-bb		1984/tcp    # BB
-#			   Sean MacGuire &lt;sean@maclawran.ca&gt;
-hsrp		1985/udp    # Hot Standby Router Protocol
-hsrp		1985/tcp    # Hot Standby Router Protocol
-#			   Phil Morton &lt;pmorton@cisco.com&gt;
+bb              1984/udp    # BB
+bb              1984/tcp    # BB
+#                          Sean MacGuire &lt;sean@maclawran.ca&gt;
+hsrp            1985/udp    # Hot Standby Router Protocol
+hsrp            1985/tcp    # Hot Standby Router Protocol
+#                          Phil Morton &lt;pmorton@cisco.com&gt;
 licensedaemon   1986/udp    # cisco license management
 licensedaemon   1986/tcp    # cisco license management
 tr-rsrb-p1      1987/udp    # cisco RSRB Priority 1 port
@@ -4589,101 +4589,101 @@ tcp-id-port     1999/tcp    # cisco identification port
 callbook        2000/udp    # callbook
 callbook        2000/tcp    # callbook
 #                          Devon Bowen &lt;bowen@cs.buffalo.edu&gt;
-wizard		2001/udp    # curry
-dc		2001/tcp # 
-globe		2002/udp # 
-globe		2002/tcp # 
+wizard          2001/udp    # curry
+dc              2001/tcp #
+globe           2002/udp #
+globe           2002/tcp #
 emce            2004/udp    # CCWS mm conf
-mailbox		2004/tcp # 
-oracle		2005/udp # 
-berknet		2005/tcp # 
-raid-cc		2006/udp    # raid
-invokator	2006/tcp # 
-raid-am		2007/udp # 
-dectalk		2007/tcp # 
-terminaldb	2008/udp # 
-conf		2008/tcp # 
-whosockami	2009/udp # 
-news		2009/tcp # 
-pipe_server	2010/udp # 
-search		2010/tcp # 
-servserv	2011/udp # 
-raid-cc		2011/tcp    # raid
-raid-ac		2012/udp # 
-ttyinfo		2012/tcp # 
-raid-cd		2013/udp # 
-raid-am		2013/tcp # 
-raid-sf		2014/udp # 
-troff		2014/tcp # 
-raid-cs		2015/udp # 
-cypress		2015/tcp # 
-bootserver	2016/udp # 
-bootserver	2016/tcp # 
-bootclient	2017/udp # 
-cypress-stat	2017/tcp # 
-rellpack	2018/udp # 
-terminaldb	2018/tcp # 
-about		2019/udp # 
-whosockami	2019/tcp # 
-xinupageserver	2020/udp # 
-xinupageserver	2020/tcp # 
-xinuexpansion1	2021/udp # 
-servexec	2021/tcp # 
-xinuexpansion2	2022/udp # 
-down		2022/tcp # 
-xinuexpansion3	2023/udp # 
-xinuexpansion3	2023/tcp # 
-xinuexpansion4	2024/udp # 
-xinuexpansion4	2024/tcp # 
-xribs		2025/udp # 
-ellpack		2025/tcp # 
-scrabble	2026/udp # 
-scrabble	2026/tcp # 
-shadowserver	2027/udp # 
-shadowserver	2027/tcp # 
-submitserver	2028/udp # 
-submitserver	2028/tcp # 
+mailbox         2004/tcp #
+oracle          2005/udp #
+berknet         2005/tcp #
+raid-cc         2006/udp    # raid
+invokator       2006/tcp #
+raid-am         2007/udp #
+dectalk         2007/tcp #
+terminaldb      2008/udp #
+conf            2008/tcp #
+whosockami      2009/udp #
+news            2009/tcp #
+pipe_server     2010/udp #
+search          2010/tcp #
+servserv        2011/udp #
+raid-cc         2011/tcp    # raid
+raid-ac         2012/udp #
+ttyinfo         2012/tcp #
+raid-cd         2013/udp #
+raid-am         2013/tcp #
+raid-sf         2014/udp #
+troff           2014/tcp #
+raid-cs         2015/udp #
+cypress         2015/tcp #
+bootserver      2016/udp #
+bootserver      2016/tcp #
+bootclient      2017/udp #
+cypress-stat    2017/tcp #
+rellpack        2018/udp #
+terminaldb      2018/tcp #
+about           2019/udp #
+whosockami      2019/tcp #
+xinupageserver  2020/udp #
+xinupageserver  2020/tcp #
+xinuexpansion1  2021/udp #
+servexec        2021/tcp #
+xinuexpansion2  2022/udp #
+down            2022/tcp #
+xinuexpansion3  2023/udp #
+xinuexpansion3  2023/tcp #
+xinuexpansion4  2024/udp #
+xinuexpansion4  2024/tcp #
+xribs           2025/udp #
+ellpack         2025/tcp #
+scrabble        2026/udp #
+scrabble        2026/tcp #
+shadowserver    2027/udp #
+shadowserver    2027/tcp #
+submitserver    2028/udp #
+submitserver    2028/tcp #
 #               2029       Unassigned
-device2		2030/udp # 
-device2		2030/tcp # 
+device2         2030/udp #
+device2         2030/tcp #
 #               2031       Unassigned    
 blackboard      2032/udp # 
 blackboard      2032/tcp # 
-glogger		2033/udp # 
-glogger		2033/tcp # 
-scoremgr	2034/udp # 
-scoremgr	2034/tcp # 
-imsldoc		2035/udp # 
-imsldoc		2035/tcp # 
+glogger         2033/udp #
+glogger         2033/tcp #
+scoremgr        2034/udp #
+scoremgr        2034/tcp #
+imsldoc         2035/udp #
+imsldoc         2035/tcp #
 #               2036       Unassigned
 p2plus          2037/udp    # P2plus Application Server
 p2plus          2037/tcp    # P2plus Application Server
 #                          Thomas Boerkel &lt;tb@ap-ag.com&gt;
-objectmanager	2038/udp # 
-objectmanager	2038/tcp # 
+objectmanager   2038/udp #
+objectmanager   2038/tcp #
 #               2039       Unassigned
-lam		2040/udp # 
-lam		2040/tcp # 
-interbase	2041/udp # 
-interbase	2041/tcp # 
-isis		2042/udp    # isis
-isis		2042/tcp    # isis
-isis-bcast	2043/udp    # isis-bcast
-isis-bcast	2043/tcp    # isis-bcast
+lam             2040/udp #
+lam             2040/tcp #
+interbase       2041/udp #
+interbase       2041/tcp #
+isis            2042/udp    # isis
+isis            2042/tcp    # isis
+isis-bcast      2043/udp    # isis-bcast
+isis-bcast      2043/tcp    # isis-bcast
 #                          Ken Chapman &lt;kchapman@isis.com&gt;
-rimsl		2044/udp # 
-rimsl		2044/tcp # 
-cdfunc		2045/udp # 
-cdfunc		2045/tcp # 
-sdfunc		2046/udp # 
-sdfunc		2046/tcp # 
-dls		2047/udp # 
-dls		2047/tcp # 
-dls-monitor	2048/udp # 
-dls-monitor	2048/tcp # 
+rimsl           2044/udp #
+rimsl           2044/tcp #
+cdfunc          2045/udp #
+cdfunc          2045/tcp #
+sdfunc          2046/udp #
+sdfunc          2046/tcp #
+dls             2047/udp #
+dls             2047/tcp #
+dls-monitor     2048/udp #
+dls-monitor     2048/tcp #
 #                         &lt;== NOTE Conflict on 2049 !
-shilp		2049/udp nfs # 
-shilp		2049/tcp nfs # 
+shilp           2049/udp nfs #
+shilp           2049/tcp nfs #
 #                          Brent Callaghan &lt;brent@terra.eng.sun.com&gt;
 av-emb-config   2050/udp    # Avaya EMB Config Port
 av-emb-config   2050/tcp    # Avaya EMB Config Port
@@ -4705,7 +4705,7 @@ iop             2055/tcp    # Iliad-Odyssey Protocol
 #                          Bruce Lueckenhoff &lt;brucelu@cisco.com&gt;
 omnisky         2056/udp    # OmniSky Port
 omnisky         2056/tcp    # OmniSky Port
-#	                   Oren Hurvitz &lt;oren@omnisky.com&gt;  
+#                          Oren Hurvitz &lt;oren@omnisky.com&gt;
 rich-cp         2057/udp    # Rich Content Protocol
 rich-cp         2057/tcp    # Rich Content Protocol
 #                          Ronen Vainish &lt;ronen@digitalfountain.com&gt; 
@@ -4789,39 +4789,39 @@ eli             2087/tcp    # ELI - Event Logging Integration
 sep             2089/udp    # Security Encapsulation Protocol - SEP 
 sep             2089/tcp    # Security Encapsulation Protocol - SEP 
 #                          Maya Zimerman &lt;mayaz@radware.co.il&gt;
-lrp		2090/udp    # Load Report Protocol
-lrp		2090/tcp    # Load Report Protocol
-#			   Amir Peless &lt;amirp@radware.co.il&gt;
-prp		2091/udp    # PRP
-prp		2091/tcp    # PRP
-#			   Amir Peless &lt;amirp@radware.co.il&gt;
-descent3	2092/udp    # Descent 3
-descent3	2092/tcp    # Descent 3
-#			   Kevin Bentley &lt;Kevin@outrage.com&gt;
-nbx-cc		2093/udp    # NBX CC
-nbx-cc		2093/tcp    # NBX CC
-nbx-au		2094/udp    # NBX AU
-nbx-au		2094/tcp    # NBX AU
-nbx-ser		2095/udp    # NBX SER
-nbx-ser		2095/tcp    # NBX SER
-nbx-dir		2096/udp    # NBX DIR
-nbx-dir		2096/tcp    # NBX DIR
-#			   Henry Houh &lt;hhouh@nbxcorp.com&gt;
-jetformpreview	2097/udp    # Jet Form Preview
-jetformpreview	2097/tcp    # Jet Form Preview
-#			   Zygmunt Wiercioch &lt;zyg@jetform.com&gt;
-dialog-port	2098/udp    # Dialog Port
-dialog-port	2098/tcp    # Dialog Port
-#			   Joseph Mathew &lt;mjoseph@dosa.cisco.com&gt;
-h2250-annex-g	2099/udp    # H.225.0 Annex G
-h2250-annex-g	2099/tcp    # H.225.0 Annex G
-#			   Gur Kimchi &lt;gur.kimchi@vocaltec.com&gt;
+lrp             2090/udp    # Load Report Protocol
+lrp             2090/tcp    # Load Report Protocol
+#                          Amir Peless &lt;amirp@radware.co.il&gt;
+prp             2091/udp    # PRP
+prp             2091/tcp    # PRP
+#                          Amir Peless &lt;amirp@radware.co.il&gt;
+descent3        2092/udp    # Descent 3
+descent3        2092/tcp    # Descent 3
+#                          Kevin Bentley &lt;Kevin@outrage.com&gt;
+nbx-cc          2093/udp    # NBX CC
+nbx-cc          2093/tcp    # NBX CC
+nbx-au          2094/udp    # NBX AU
+nbx-au          2094/tcp    # NBX AU
+nbx-ser         2095/udp    # NBX SER
+nbx-ser         2095/tcp    # NBX SER
+nbx-dir         2096/udp    # NBX DIR
+nbx-dir         2096/tcp    # NBX DIR
+#                          Henry Houh &lt;hhouh@nbxcorp.com&gt;
+jetformpreview  2097/udp    # Jet Form Preview
+jetformpreview  2097/tcp    # Jet Form Preview
+#                          Zygmunt Wiercioch &lt;zyg@jetform.com&gt;
+dialog-port     2098/udp    # Dialog Port
+dialog-port     2098/tcp    # Dialog Port
+#                          Joseph Mathew &lt;mjoseph@dosa.cisco.com&gt;
+h2250-annex-g   2099/udp    # H.225.0 Annex G
+h2250-annex-g   2099/tcp    # H.225.0 Annex G
+#                          Gur Kimchi &lt;gur.kimchi@vocaltec.com&gt;
 amiganetfs      2100/udp    # Amiga Network Filesystem
 amiganetfs      2100/tcp    # Amiga Network Filesystem
 #                          Rudi Chiarito &lt;nutello@sweetness.com&gt;
-rtcm-sc104	2101/udp    # rtcm-sc104
-rtcm-sc104	2101/tcp    # rtcm-sc104
-#			   Wolfgang Rupprecht &lt;wolfgang@wsrcc.com&gt;
+rtcm-sc104      2101/udp    # rtcm-sc104
+rtcm-sc104      2101/tcp    # rtcm-sc104
+#                          Wolfgang Rupprecht &lt;wolfgang@wsrcc.com&gt;
 zephyr-srv      2102/udp    # Zephyr server
 zephyr-srv      2102/tcp    # Zephyr server
 zephyr-clt      2103/udp    # Zephyr serv-hm connection
@@ -4829,18 +4829,18 @@ zephyr-clt      2103/tcp    # Zephyr serv-hm connection
 zephyr-hm       2104/udp    # Zephyr hostmanager
 zephyr-hm       2104/tcp    # Zephyr hostmanager
 #                          Greg Hudson &lt;zephyr-bugs@mit.edu&gt;
-minipay		2105/udp    # MiniPay
-minipay		2105/tcp    # MiniPay
-#			   Amir Herzberg &lt;amirh@vnet.ibm.com&gt;
-mzap		2106/udp    # MZAP
-mzap		2106/tcp    # MZAP
-#			   Dave Thaler &lt;dthaler@microsoft.com&gt;
-bintec-admin	2107/udp    # BinTec Admin 
-bintec-admin	2107/tcp    # BinTec Admin 
-#			   Thomas Schmidt &lt;ts@bintec.de&gt;
-comcam		2108/udp    # Comcam
-comcam		2108/tcp    # Comcam
-#			   Don Gilbreath &lt;don@comcam.net&gt;
+minipay         2105/udp    # MiniPay
+minipay         2105/tcp    # MiniPay
+#                          Amir Herzberg &lt;amirh@vnet.ibm.com&gt;
+mzap            2106/udp    # MZAP
+mzap            2106/tcp    # MZAP
+#                          Dave Thaler &lt;dthaler@microsoft.com&gt;
+bintec-admin    2107/udp    # BinTec Admin
+bintec-admin    2107/tcp    # BinTec Admin
+#                          Thomas Schmidt &lt;ts@bintec.de&gt;
+comcam          2108/udp    # Comcam
+comcam          2108/tcp    # Comcam
+#                          Don Gilbreath &lt;don@comcam.net&gt;
 ergolight       2109/udp    # Ergolight
 ergolight       2109/tcp    # Ergolight
 #                          Jindra Ryvola &lt;jryvola@ledalite.com&gt;
@@ -4931,7 +4931,7 @@ unbind-cluster  2138/udp    # UNBIND-CLUSTER
 unbind-cluster  2138/tcp    # UNBIND-CLUSTER
 #                          Francois Harvey &lt;securiweb@pandore.qc.ca&gt;
 ias-auth        2139/udp    # IAS-AUTH
-ias-auth        2139/tcp    # IAS-AUTH	     
+ias-auth        2139/tcp    # IAS-AUTH
 ias-reg         2140/udp    # IAS-REG
 ias-reg         2140/tcp    # IAS-REG
 ias-admind      2141/udp    # IAS-ADMIND
@@ -4953,13 +4953,13 @@ lv-auth         2147/tcp    # Live Vault Authentication
 #                          Ted Hess &lt;thess@livevault.com&gt;
 veritas-ucl     2148/udp    # VERITAS UNIVERSAL COMMUNICATION LAYER
 veritas-ucl     2148/tcp    # VERITAS UNIVERSAL COMMUNICATION LAYER
-#                          Songlin Ren &lt;ren@veritas.com&gt;	
+#                          Songlin Ren &lt;ren@veritas.com&gt;
 acptsys         2149/udp    # ACPTSYS
 acptsys         2149/tcp    # ACPTSYS
 #                          Michael Lekias &lt;admin@psdesign.com.au&gt;         
 dynamic3d       2150/udp    # DYNAMIC3D
 dynamic3d       2150/tcp    # DYNAMIC3D
-#                          Tobias Wegner &lt;wegner@novagate.de&gt;		
+#                          Tobias Wegner &lt;wegner@novagate.de&gt;
 docent          2151/udp    # DOCENT
 docent          2151/tcp    # DOCENT
 #                          Hali Lindbloom &lt;halil@docent.com&gt;
@@ -4984,19 +4984,19 @@ navisphere-sec  2163/tcp    # Navisphere Secure
 ddns-v3         2164/udp    # Dynamic DNS Version 3
 ddns-v3         2164/tcp    # Dynamic DNS Version 3
 #                          Alan Yates &lt;alany@ay.com.au&gt;
-x-bone-api	2165/udp    # X-Bone API
-x-bone-api	2165/tcp    # X-Bone API
-#			   Joe Touch &lt;touch@isi.edu&gt;
+x-bone-api      2165/udp    # X-Bone API
+x-bone-api      2165/tcp    # X-Bone API
+#                          Joe Touch &lt;touch@isi.edu&gt;
 iwserver        2166/udp    # iwserver
 iwserver        2166/tcp    # iwserver
 #                          Fred Surr &lt;quest_iana@oz.quest.com&gt;
 raw-serial      2167/udp    # Raw Async Serial Link
 raw-serial      2167/tcp    # Raw Async Serial Link
 #                          Benjamin Green &lt;benjamin@lh.co.nz&gt;
-#	        2168-2179  Unassigned
-mc-gt-srv	2180/udp    # Millicent Vendor Gateway Server
-mc-gt-srv	2180/tcp    # Millicent Vendor Gateway Server
-#			   Steve Glassman &lt;steveg@pa.dec.com&gt;
+#               2168-2179  Unassigned
+mc-gt-srv       2180/udp    # Millicent Vendor Gateway Server
+mc-gt-srv       2180/tcp    # Millicent Vendor Gateway Server
+#                          Steve Glassman &lt;steveg@pa.dec.com&gt;
 eforward        2181/udp    # eforward
 eforward        2181/tcp    # eforward
 #                          Greg Pringle &lt;admin@corvedia.com&gt;
@@ -5022,42 +5022,42 @@ kali            2213/tcp    # Kali
 #                          Jay Cotton &lt;JAY@calc.vet.uga.edu&gt;
 netiq           2220/udp    # NetIQ End2End
 netiq           2220/tcp    # NetIQ End2End
-#			   Gary Weichinger &lt;gary.weichinger@netiq.com&gt;
-rockwell-csp1	2221/udp    # Rockwell CSP1
-rockwell-csp1	2221/tcp    # Rockwell CSP1
-rockwell-csp2	2222/udp    # Rockwell CSP2
-rockwell-csp2	2222/tcp    # Rockwell CSP2
-rockwell-csp3	2223/udp    # Rockwell CSP3
-rockwell-csp3	2223/tcp    # Rockwell CSP3
-#			   Brian Batke &lt;babatke@ra.rockwell.com&gt;	
+#                          Gary Weichinger &lt;gary.weichinger@netiq.com&gt;
+rockwell-csp1   2221/udp    # Rockwell CSP1
+rockwell-csp1   2221/tcp    # Rockwell CSP1
+rockwell-csp2   2222/udp    # Rockwell CSP2
+rockwell-csp2   2222/tcp    # Rockwell CSP2
+rockwell-csp3   2223/udp    # Rockwell CSP3
+rockwell-csp3   2223/tcp    # Rockwell CSP3
+#                          Brian Batke &lt;babatke@ra.rockwell.com&gt;
 #
 ivs-video       2232/udp    # IVS Video default
 ivs-video       2232/tcp    # IVS Video default
 #                  Thierry Turletti &lt;Thierry.Turletti@sophia.inria.fr&gt;
-infocrypt	2233/udp    # INFOCRYPT
-infocrypt	2233/tcp    # INFOCRYPT
-#			   Erica Liu &lt;liue@isolation.com&gt;
+infocrypt       2233/udp    # INFOCRYPT
+infocrypt       2233/tcp    # INFOCRYPT
+#                          Erica Liu &lt;liue@isolation.com&gt;
 directplay      2234/udp    # DirectPlay
 directplay      2234/tcp    # DirectPlay
 #                          Ajay Jindal &lt;ajayj@microsoft.com&gt;
 sercomm-wlink   2235/udp    # Sercomm-WLink
-sercomm-wlink	2235/tcp    # Sercomm-WLink
-#			   Melinda Tsao &lt;melinda@tpe1.sercomm.com.tw&gt;
-nani		2236/udp    # Nani
-nani		2236/tcp    # Nani
-#			   Steve Benoit &lt;sbenoi01@eng.eds.com&gt;
+sercomm-wlink   2235/tcp    # Sercomm-WLink
+#                          Melinda Tsao &lt;melinda@tpe1.sercomm.com.tw&gt;
+nani            2236/udp    # Nani
+nani            2236/tcp    # Nani
+#                          Steve Benoit &lt;sbenoi01@eng.eds.com&gt;
 optech-port1-lm 2237/udp    # Optech Port1 License Manager
 optech-port1-lm 2237/tcp    # Optech Port1 License Manager
-#		 	   Gerard Cannie &lt;jcannie@opticaltech.com&gt;
-aviva-sna	2238/udp    # AVIVA SNA SERVER
-aviva-sna	2238/tcp    # AVIVA SNA SERVER
-#			   Vick Keshishian &lt;vickenK@192.219.82.71&gt;
+#                          Gerard Cannie &lt;jcannie@opticaltech.com&gt;
+aviva-sna       2238/udp    # AVIVA SNA SERVER
+aviva-sna       2238/tcp    # AVIVA SNA SERVER
+#                          Vick Keshishian &lt;vickenK@192.219.82.71&gt;
 imagequery      2239/udp    # Image Query
-imagequery	2239/tcp    # Image Query	
-#			   Charles Jacobs &lt;cjacobs@numinous.com&gt;
-recipe		2240/udp    # RECIPe
-recipe		2240/tcp    # RECIPe
-#			   Charlie Limoges &lt;charlie.limoges@gd-cs.com&gt;
+imagequery      2239/tcp    # Image Query
+#                          Charles Jacobs &lt;cjacobs@numinous.com&gt;
+recipe          2240/udp    # RECIPe
+recipe          2240/tcp    # RECIPe
+#                          Charlie Limoges &lt;charlie.limoges@gd-cs.com&gt;
 ivsd            2241/udp    # IVS Daemon
 ivsd            2241/tcp    # IVS Daemon
 #                          Thierry Turletti 
@@ -5065,38 +5065,38 @@ ivsd            2241/tcp    # IVS Daemon
 foliocorp       2242/udp    # Folio Remote Server
 foliocorp       2242/tcp    # Folio Remote Server
 #                          Pat Mcgowan &lt;pmcgowan@folio.com&gt;
-magicom		2243/udp    # Magicom Protocol
-magicom		2243/tcp    # Magicom Protocol
-#			   Yossi Appleboum &lt;yossia@magicom.co.il&gt;
-nmsserver	2244/udp    # NMS Server
-nmsserver	2244/tcp    # NMS Server
-#			   Dmitry Krasnonosenkikh
-#			   &lt;Dmitry_Krasnonosenkih@nmss.com&gt;
-hao		2245/udp    # HaO
-hao		2245/tcp    # HaO
-#			   Panic Ride &lt;panicride@hao.org&gt;
+magicom         2243/udp    # Magicom Protocol
+magicom         2243/tcp    # Magicom Protocol
+#                          Yossi Appleboum &lt;yossia@magicom.co.il&gt;
+nmsserver       2244/udp    # NMS Server
+nmsserver       2244/tcp    # NMS Server
+#                          Dmitry Krasnonosenkikh
+#                          &lt;Dmitry_Krasnonosenkih@nmss.com&gt;
+hao             2245/udp    # HaO
+hao             2245/tcp    # HaO
+#                          Panic Ride &lt;panicride@hao.org&gt;
 pc-mta-addrmap  2246/udp    # PacketCable MTA Addr Map
 pc-mta-addrmap  2246/tcp    # PacketCable MTA Addr Map
 #                          Dave Maxwell &lt;d.maxwell@cablelabs.com&gt;
 #               2247       Unassigned
-ums 		2248/udp    # User Management Service
+ums             2248/udp    # User Management Service
 ums             2248/tcp    # User Management Service
 #                          Andrew Crockford 
 #                          &lt;andrew.crockford@modus-interactive.co.uk&gt;
-rfmp		2249/udp    # RISO File Manager Protocol
-rfmp		2249/tcp    # RISO File Manager Protocol
+rfmp            2249/udp    # RISO File Manager Protocol
+rfmp            2249/tcp    # RISO File Manager Protocol
 #                          Shinji Yamanaka &lt;syamanaka@jci.co.jp&gt;
 remote-collab   2250/udp    # remote-collab
 remote-collab   2250/tcp    # remote-collab
 #                          Richard Walters &lt;walters@cs.ucdavis.edu&gt;
 dif-port        2251/udp    # Distributed Framework Port
-dif-port	2251/tcp    # Distributed Framework Port
+dif-port        2251/tcp    # Distributed Framework Port
 #                          Sebastien Lambla &lt;lambla@bouygtel.com&gt;
 njenet-ssl      2252/udp    # NJENET using SSL
 njenet-ssl      2252/tcp    # NJENET using SSL
 #                          Hans U Schmidt &lt;schmidth@de.ibm.com&gt;
 dtv-chan-req    2253/udp    # DTV Channel Request
-dtv-chan-req	2253/tcp    # DTV Channel Request
+dtv-chan-req    2253/tcp    # DTV Channel Request
 #                          Richard Hodges &lt;rh@matriplex.com&gt;
 seispoc         2254/udp    # Seismic P.O.C. Port
 seispoc         2254/tcp    # Seismic P.O.C. Port
@@ -5128,229 +5128,229 @@ lnvmailmon      2285/tcp    # LNVMAILMON
 nas-metering    2286/udp    # NAS-Metering
 nas-metering    2286/tcp    # NAS-Metering
 #                          Steven Sawkins &lt;ssawkins@symantec.com&gt;    
-dna		2287/udp    # DNA
-dna		2287/tcp    # DNA
-#			   Tung Nguyen &lt;dash@ricochet.net&gt;
-netml		2288/udp    # NETML
-netml		2288/tcp    # NETML
-#			   Jochen Hansmeyer &lt;cjh@krypton.de&gt;
+dna             2287/udp    # DNA
+dna             2287/tcp    # DNA
+#                          Tung Nguyen &lt;dash@ricochet.net&gt;
+netml           2288/udp    # NETML
+netml           2288/tcp    # NETML
+#                          Jochen Hansmeyer &lt;cjh@krypton.de&gt;
 #               2289-2293  Unassigned
-konshus-lm	2294/udp    # Konshus License Manager (FLEX)
-konshus-lm	2294/tcp    # Konshus License Manager (FLEX)
-#			   Francois Painchaud &lt;fpainchaud@konshus.com&gt;
-advant-lm	2295/udp    # Advant License Manager
-advant-lm	2295/tcp    # Advant License Manager
-#			   Lars-Goran Magnusson 
+konshus-lm      2294/udp    # Konshus License Manager (FLEX)
+konshus-lm      2294/tcp    # Konshus License Manager (FLEX)
+#                          Francois Painchaud &lt;fpainchaud@konshus.com&gt;
+advant-lm       2295/udp    # Advant License Manager
+advant-lm       2295/tcp    # Advant License Manager
+#                          Lars-Goran Magnusson
 #                          &lt;lars-goran.magnusson@seisy.mail.abb.com&gt;
-theta-lm	2296/udp    # Theta License Manager (Rainbow)
-theta-lm	2296/tcp    # Theta License Manager (Rainbow)
-#		   	   David Thompson &lt;theta@theta-ent.com&gt;
-d2k-datamover1	2297/udp    # D2K DataMover 1
-d2k-datamover1	2297/tcp    # D2K DataMover 1
-d2k-datamover2	2298/udp    # D2K DataMover 2
+theta-lm        2296/udp    # Theta License Manager (Rainbow)
+theta-lm        2296/tcp    # Theta License Manager (Rainbow)
+#                          David Thompson &lt;theta@theta-ent.com&gt;
+d2k-datamover1  2297/udp    # D2K DataMover 1
+d2k-datamover1  2297/tcp    # D2K DataMover 1
+d2k-datamover2  2298/udp    # D2K DataMover 2
 d2k-datamover2  2298/tcp    # D2K DataMover 2
-#			   Eric Lan &lt;elan@d2k.com&gt;
-pc-telecommute	2299/udp    # PC Telecommute
-pc-telecommute	2299/tcp    # PC Telecommute
-#			   John Daniel Bonamico &lt;jbonamico@symantec.com&gt;
+#                          Eric Lan &lt;elan@d2k.com&gt;
+pc-telecommute  2299/udp    # PC Telecommute
+pc-telecommute  2299/tcp    # PC Telecommute
+#                          John Daniel Bonamico &lt;jbonamico@symantec.com&gt;
 cvmmon          2300/udp    # CVMMON
 cvmmon          2300/tcp    # CVMMON
 #                          Roger Kumpf &lt;kumpf@cup.hp.com&gt;
 cpq-wbem        2301/udp    # Compaq HTTP
 cpq-wbem        2301/tcp    # Compaq HTTP
 #                          Scott Shaffer &lt;scott.shaffer@hp.com&gt;
-binderysupport	2302/udp    # Bindery Support
-binderysupport	2302/tcp    # Bindery Support
-#			   Narasimha Rao N. &lt;nnarasimharao@novell.com&gt;
-proxy-gateway	2303/udp    # Proxy Gateway
-proxy-gateway	2303/tcp    # Proxy Gateway
-#			   Paul Funk &lt;paul@funk.com&gt;
-attachmate-uts	2304/udp    # Attachmate UTS
-attachmate-uts	2304/tcp    # Attachmate UTS
-#			   George Gianelos &lt;Georgegi@Attachmate.com&gt;
-mt-scaleserver	2305/udp    # MT ScaleServer
-mt-scaleserver	2305/tcp    # MT ScaleServer
-#			   Paul Glaubitz &lt;Paul.Glaubitz@mt.com&gt;
-tappi-boxnet	2306/udp    # TAPPI BoxNet
-tappi-boxnet	2306/tcp    # TAPPI BoxNet
-#			   Richard Spartz &lt;rspartz@alliancetechnical.com&gt;
+binderysupport  2302/udp    # Bindery Support
+binderysupport  2302/tcp    # Bindery Support
+#                          Narasimha Rao N. &lt;nnarasimharao@novell.com&gt;
+proxy-gateway   2303/udp    # Proxy Gateway
+proxy-gateway   2303/tcp    # Proxy Gateway
+#                          Paul Funk &lt;paul@funk.com&gt;
+attachmate-uts  2304/udp    # Attachmate UTS
+attachmate-uts  2304/tcp    # Attachmate UTS
+#                          George Gianelos &lt;Georgegi@Attachmate.com&gt;
+mt-scaleserver  2305/udp    # MT ScaleServer
+mt-scaleserver  2305/tcp    # MT ScaleServer
+#                          Paul Glaubitz &lt;Paul.Glaubitz@mt.com&gt;
+tappi-boxnet    2306/udp    # TAPPI BoxNet
+tappi-boxnet    2306/tcp    # TAPPI BoxNet
+#                          Richard Spartz &lt;rspartz@alliancetechnical.com&gt;
 pehelp          2307/udp    # pehelp
 pehelp          2307/tcp    # pehelp
 #                          Jens Kilian &lt;jensk@hpbeo82.bbn.hp.com&gt;
-sdhelp		2308/udp    # sdhelp
-sdhelp		2308/tcp    # sdhelp
-#			   Annette Klecha &lt;annette_klecha@bbn.hp.com&gt;
-sdserver	2309/udp    # SD Server
-sdserver	2309/tcp    # SD Server
-sdclient	2310/udp    # SD Client
-sdclient	2310/tcp    # SD Client
-#			   Jeurgen Broesamle &lt;juergb@bbn.hp.com&gt;
-messageservice	2311/udp    # Message Service
-messageservice	2311/tcp    # Message Service
-#			   No contact Listed	
-iapp		2313/udp    # IAPP (Inter Access Point Protocol)
-iapp		2313/tcp    # IAPP (Inter Access Point Protocol)
-#			   Henri Moelard &lt;moelard@lucent.com&gt;
-cr-websystems	2314/udp    # CR WebSystems
-cr-websystems	2314/tcp    # CR WebSystems
-#			   Robin Giese &lt;rgiese@peddie.org&gt;
-precise-sft	2315/udp    # Precise Sft.
-precise-sft	2315/tcp    # Precise Sft.
-#			   Michael Landwehr &lt;mikel@precisesoft.co.il&gt;
-sent-lm		2316/udp    # SENT License Manager
-sent-lm		2316/tcp    # SENT License Manager
-#			   Pisharath Krishnan &lt;krishnan@axis-inc.com&gt;
-attachmate-g32	2317/udp    # Attachmate G32
-attachmate-g32	2317/tcp    # Attachmate G32
-#			   Bryce Bhatnagar &lt;BRYCEBH@Attachmate.com&gt;
-cadencecontrol	2318/udp    # Cadence Control
-cadencecontrol	2318/tcp    # Cadence Control
-#			   Buck Caldwell &lt;buck_c@polygon.com&gt;
-infolibria	2319/udp    # InfoLibria
-infolibria	2319/tcp    # InfoLibria
-#			   Chris Chiotasso &lt;cchiotasso@infolibria.com&gt;
-siebel-ns	2320/udp    # Siebel NS
-siebel-ns	2320/tcp    # Siebel NS
-#			   Gilberto Arnaiz &lt;garnaiz@siebel.com&gt;
-rdlap		2321/udp    # RDLAP
-rdlap		2321/tcp    # RDLAP
-#			   Robert Wiebe &lt;crw010@email.mot.com&gt;
-ofsd		2322/udp    # ofsd
-ofsd		2322/tcp    # ofsd
-3d-nfsd		2323/udp    # 3d-nfsd
-3d-nfsd		2323/tcp    # 3d-nfsd
-#			   Mike Sherrill &lt;sherrill@commvault.com&gt;
-cosmocall	2324/udp    # Cosmocall
-cosmocall	2324/tcp    # Cosmocall
-#			   Steve Dellutri
-designspace-lm	2325/udp    # Design Space License Management
-designspace-lm	2325/tcp    # Design Space License Management
-#			   Suzanne Lorrin &lt;suzanne.lorrin@ansys.com&gt;
-idcp		2326/udp    # IDCP
-idcp		2326/tcp    # IDCP
-#			   Keisokugiken Corp. &lt;adda@kgc.co.jp&gt;
-xingcsm		2327/udp    # xingcsm
-xingcsm		2327/tcp    # xingcsm
-#			   Dave Spencer &lt;dspencer@xingtech.com&gt;
-netrix-sftm	2328/udp    # Netrix SFTM
-netrix-sftm	2328/tcp    # Netrix SFTM
-#			   Garrett Herschleb &lt;garrett@netrix.com&gt;
-nvd		2329/udp    # NVD
-nvd		2329/tcp    # NVD
-#			   Peter Weyman &lt;pjweyman@noblenet.com&gt;
-tscchat		2330/udp    # TSCCHAT
-tscchat		2330/tcp    # TSCCHAT
-#			   Mike Jackson &lt;mhjack@tscnet.com&gt;
-agentview	2331/udp    # AGENTVIEW
-agentview	2331/tcp    # AGENTVIEW
-#			   Ram Iyer &lt;ram@aaccorp.com&gt;
-rcc-host	2332/udp    # RCC Host
-rcc-host	2332/tcp    # RCC Host 
-#			   Martin Shoemaker &lt;shoemakerml@rapistan.com&gt;
+sdhelp          2308/udp    # sdhelp
+sdhelp          2308/tcp    # sdhelp
+#                          Annette Klecha &lt;annette_klecha@bbn.hp.com&gt;
+sdserver        2309/udp    # SD Server
+sdserver        2309/tcp    # SD Server
+sdclient        2310/udp    # SD Client
+sdclient        2310/tcp    # SD Client
+#                          Jeurgen Broesamle &lt;juergb@bbn.hp.com&gt;
+messageservice  2311/udp    # Message Service
+messageservice  2311/tcp    # Message Service
+#                          No contact Listed
+iapp            2313/udp    # IAPP (Inter Access Point Protocol)
+iapp            2313/tcp    # IAPP (Inter Access Point Protocol)
+#                          Henri Moelard &lt;moelard@lucent.com&gt;
+cr-websystems   2314/udp    # CR WebSystems
+cr-websystems   2314/tcp    # CR WebSystems
+#                          Robin Giese &lt;rgiese@peddie.org&gt;
+precise-sft     2315/udp    # Precise Sft.
+precise-sft     2315/tcp    # Precise Sft.
+#                          Michael Landwehr &lt;mikel@precisesoft.co.il&gt;
+sent-lm         2316/udp    # SENT License Manager
+sent-lm         2316/tcp    # SENT License Manager
+#                          Pisharath Krishnan &lt;krishnan@axis-inc.com&gt;
+attachmate-g32  2317/udp    # Attachmate G32
+attachmate-g32  2317/tcp    # Attachmate G32
+#                          Bryce Bhatnagar &lt;BRYCEBH@Attachmate.com&gt;
+cadencecontrol  2318/udp    # Cadence Control
+cadencecontrol  2318/tcp    # Cadence Control
+#                          Buck Caldwell &lt;buck_c@polygon.com&gt;
+infolibria      2319/udp    # InfoLibria
+infolibria      2319/tcp    # InfoLibria
+#                          Chris Chiotasso &lt;cchiotasso@infolibria.com&gt;
+siebel-ns       2320/udp    # Siebel NS
+siebel-ns       2320/tcp    # Siebel NS
+#                          Gilberto Arnaiz &lt;garnaiz@siebel.com&gt;
+rdlap           2321/udp    # RDLAP
+rdlap           2321/tcp    # RDLAP
+#                          Robert Wiebe &lt;crw010@email.mot.com&gt;
+ofsd            2322/udp    # ofsd
+ofsd            2322/tcp    # ofsd
+3d-nfsd         2323/udp    # 3d-nfsd
+3d-nfsd         2323/tcp    # 3d-nfsd
+#                          Mike Sherrill &lt;sherrill@commvault.com&gt;
+cosmocall       2324/udp    # Cosmocall
+cosmocall       2324/tcp    # Cosmocall
+#                          Steve Dellutri
+designspace-lm  2325/udp    # Design Space License Management
+designspace-lm  2325/tcp    # Design Space License Management
+#                          Suzanne Lorrin &lt;suzanne.lorrin@ansys.com&gt;
+idcp            2326/udp    # IDCP
+idcp            2326/tcp    # IDCP
+#                          Keisokugiken Corp. &lt;adda@kgc.co.jp&gt;
+xingcsm         2327/udp    # xingcsm
+xingcsm         2327/tcp    # xingcsm
+#                          Dave Spencer &lt;dspencer@xingtech.com&gt;
+netrix-sftm     2328/udp    # Netrix SFTM
+netrix-sftm     2328/tcp    # Netrix SFTM
+#                          Garrett Herschleb &lt;garrett@netrix.com&gt;
+nvd             2329/udp    # NVD
+nvd             2329/tcp    # NVD
+#                          Peter Weyman &lt;pjweyman@noblenet.com&gt;
+tscchat         2330/udp    # TSCCHAT
+tscchat         2330/tcp    # TSCCHAT
+#                          Mike Jackson &lt;mhjack@tscnet.com&gt;
+agentview       2331/udp    # AGENTVIEW
+agentview       2331/tcp    # AGENTVIEW
+#                          Ram Iyer &lt;ram@aaccorp.com&gt;
+rcc-host        2332/udp    # RCC Host
+rcc-host        2332/tcp    # RCC Host
+#                          Martin Shoemaker &lt;shoemakerml@rapistan.com&gt;
 snapp           2333/udp    # SNAPP
 snapp           2333/tcp    # SNAPP
 #                          Kevin Osborn &lt;kosborn@snapappliance.com&gt;
-ace-client	2334/udp    # ACE Client Auth
-ace-client	2334/tcp    # ACE Client Auth
-ace-proxy	2335/udp    # ACE Proxy
-ace-proxy	2335/tcp    # ACE Proxy
-#			   Riaz Zolfonoon &lt;rzolfonoon@securitydynamics.com&gt;
-appleugcontrol	2336/udp    # Apple UG Control
+ace-client      2334/udp    # ACE Client Auth
+ace-client      2334/tcp    # ACE Client Auth
+ace-proxy       2335/udp    # ACE Proxy
+ace-proxy       2335/tcp    # ACE Proxy
+#                          Riaz Zolfonoon &lt;rzolfonoon@securitydynamics.com&gt;
+appleugcontrol  2336/udp    # Apple UG Control
 appleugcontrol  2336/tcp    # Apple UG Control
-#			   Gene Tyacke &lt;gene@apple.com&gt;
-ideesrv		2337/udp    # ideesrv
-ideesrv		2337/tcp    # ideesrv
-#			   Marazzi &lt;fmarazzi@ideetique.com&gt;
-norton-lambert	2338/udp    # Norton Lambert
-norton-lambert	2338/tcp    # Norton Lambert
-#			   Richard de Mornay &lt;rdemornay@norton-lambert.com&gt;
-3com-webview	2339/udp    # 3Com WebView
-3com-webview	2339/tcp    # 3Com WebView
-#			   Jennifer Grace &lt;Jennifer_Grace@3com.com&gt;
-wrs_registry	2340/udp    # WRS Registry
-wrs_registry	2340/tcp    # WRS Registry
-#			   Christophe Cleraux &lt;chrisc@wrs.com&gt;
-xiostatus	2341/udp    # XIO Status
-xiostatus	2341/tcp    # XIO Status
-#			   Randy Maas &lt;randym@xiotech.com&gt;
-manage-exec	2342/udp    # Seagate Manage Exec
-manage-exec	2342/tcp    # Seagate Manage Exec
-#			   Jim Flaherty &lt;jim.flaherty@seagatesoftware.com&gt;
-nati-logos	2343/udp    # nati logos
-nati-logos	2343/tcp    # nati logos
-#			   David Pierce &lt;David.Pierce@natinst.com&gt;
-fcmsys		2344/udp    # fcmsys
-fcmsys		2344/tcp    # fcmsys
-dbm		2345/udp    # dbm
-dbm		2345/tcp    # dbm
-#			   Dean Robson &lt;dean.robson@fujitsu.com.au&gt;
-redstorm_join	2346/udp    # Game Connection Port
-redstorm_join	2346/tcp    # Game Connection Port
-redstorm_find	2347/udp    # Game Announcement and Location
-redstorm_find	2347/tcp    # Game Announcement and Location
-redstorm_info	2348/udp    # Information to query for game status
-redstorm_info	2348/tcp    # Information to query for game status
-redstorm_diag	2349/udp    # Diagnostics Port
-redstorm_diag	2349/tcp    # Diagnostics Port
-#			   David Weinstein &lt;david.weinstein@redstorm.com&gt;
-psbserver	2350/udp    # psbserver
-psbserver	2350/tcp    # psbserver
-psrserver	2351/udp    # psrserver
-psrserver	2351/tcp    # psrserver
-pslserver	2352/udp    # pslserver
-pslserver	2352/tcp    # pslserver
-pspserver	2353/udp    # pspserver
-pspserver	2353/tcp    # pspserver
-psprserver	2354/udp    # psprserver
-psprserver	2354/tcp    # psprserver
-psdbserver	2355/udp    # psdbserver
-psdbserver	2355/tcp    # psdbserver
-#			   Paul Reddy &lt;Paul@pharos.co.nz&gt;
-gxtelmd		2356/udp    # GXT License Managemant
-gxtelmd		2356/tcp    # GXT License Managemant
-#			   Robert Hodgson &lt;rrh@gxt.com&gt;
-unihub-server	2357/udp    # UniHub Server
-unihub-server	2357/tcp    # UniHub Server
-#			   Tim Kenyon &lt;Tim_Kenyon@csicontrols.com&gt;
-futrix		2358/udp    # Futrix
-futrix		2358/tcp    # Futrix
-#			   Peter Frankenberg &lt;pcfberg@ibm.net&gt;
-flukeserver	2359/udp    # FlukeServer
-flukeserver	2359/tcp    # FlukeServer
-#			   Bill Marbaker &lt;wrm@fortenet.com&gt;
-nexstorindltd	2360/udp    # NexstorIndLtd
-nexstorindltd	2360/tcp    # NexstorIndLtd
-#			   NexStor India Limited &lt;next@nda.vsnl.net.in&gt;	
-tl1		2361/udp    # TL1
-tl1		2361/tcp    # TL1
-#			   Charles Scott Roberson &lt;chip@cerent.com&gt; 
+#                          Gene Tyacke &lt;gene@apple.com&gt;
+ideesrv         2337/udp    # ideesrv
+ideesrv         2337/tcp    # ideesrv
+#                          Marazzi &lt;fmarazzi@ideetique.com&gt;
+norton-lambert  2338/udp    # Norton Lambert
+norton-lambert  2338/tcp    # Norton Lambert
+#                          Richard de Mornay &lt;rdemornay@norton-lambert.com&gt;
+3com-webview    2339/udp    # 3Com WebView
+3com-webview    2339/tcp    # 3Com WebView
+#                          Jennifer Grace &lt;Jennifer_Grace@3com.com&gt;
+wrs_registry    2340/udp    # WRS Registry
+wrs_registry    2340/tcp    # WRS Registry
+#                          Christophe Cleraux &lt;chrisc@wrs.com&gt;
+xiostatus       2341/udp    # XIO Status
+xiostatus       2341/tcp    # XIO Status
+#                          Randy Maas &lt;randym@xiotech.com&gt;
+manage-exec     2342/udp    # Seagate Manage Exec
+manage-exec     2342/tcp    # Seagate Manage Exec
+#                          Jim Flaherty &lt;jim.flaherty@seagatesoftware.com&gt;
+nati-logos      2343/udp    # nati logos
+nati-logos      2343/tcp    # nati logos
+#                          David Pierce &lt;David.Pierce@natinst.com&gt;
+fcmsys          2344/udp    # fcmsys
+fcmsys          2344/tcp    # fcmsys
+dbm             2345/udp    # dbm
+dbm             2345/tcp    # dbm
+#                          Dean Robson &lt;dean.robson@fujitsu.com.au&gt;
+redstorm_join   2346/udp    # Game Connection Port
+redstorm_join   2346/tcp    # Game Connection Port
+redstorm_find   2347/udp    # Game Announcement and Location
+redstorm_find   2347/tcp    # Game Announcement and Location
+redstorm_info   2348/udp    # Information to query for game status
+redstorm_info   2348/tcp    # Information to query for game status
+redstorm_diag   2349/udp    # Diagnostics Port
+redstorm_diag   2349/tcp    # Diagnostics Port
+#                          David Weinstein &lt;david.weinstein@redstorm.com&gt;
+psbserver       2350/udp    # psbserver
+psbserver       2350/tcp    # psbserver
+psrserver       2351/udp    # psrserver
+psrserver       2351/tcp    # psrserver
+pslserver       2352/udp    # pslserver
+pslserver       2352/tcp    # pslserver
+pspserver       2353/udp    # pspserver
+pspserver       2353/tcp    # pspserver
+psprserver      2354/udp    # psprserver
+psprserver      2354/tcp    # psprserver
+psdbserver      2355/udp    # psdbserver
+psdbserver      2355/tcp    # psdbserver
+#                          Paul Reddy &lt;Paul@pharos.co.nz&gt;
+gxtelmd         2356/udp    # GXT License Managemant
+gxtelmd         2356/tcp    # GXT License Managemant
+#                          Robert Hodgson &lt;rrh@gxt.com&gt;
+unihub-server   2357/udp    # UniHub Server
+unihub-server   2357/tcp    # UniHub Server
+#                          Tim Kenyon &lt;Tim_Kenyon@csicontrols.com&gt;
+futrix          2358/udp    # Futrix
+futrix          2358/tcp    # Futrix
+#                          Peter Frankenberg &lt;pcfberg@ibm.net&gt;
+flukeserver     2359/udp    # FlukeServer
+flukeserver     2359/tcp    # FlukeServer
+#                          Bill Marbaker &lt;wrm@fortenet.com&gt;
+nexstorindltd   2360/udp    # NexstorIndLtd
+nexstorindltd   2360/tcp    # NexstorIndLtd
+#                          NexStor India Limited &lt;next@nda.vsnl.net.in&gt;
+tl1             2361/udp    # TL1
+tl1             2361/tcp    # TL1
+#                          Charles Scott Roberson &lt;chip@cerent.com&gt;
 digiman         2362/udp    # digiman
 digiman         2362/tcp    # digiman
 #                          Aaron S. Kurland &lt;akurland@netsilicon.com&gt;
 mediacntrlnfsd  2363/udp    # Media Central NFSD 
 mediacntrlnfsd  2363/tcp    # Media Central NFSD 
-#			   shivakumar s. govindarajapuram &lt;shivak@eng.sun.com&gt;
-oi-2000		2364/udp    # OI-2000
-oi-2000		2364/tcp    # OI-2000
-#			   Software Horizons Inc. &lt;oi2000@shorizons.com&gt;   
-dbref		2365/udp    # dbref
-dbref		2365/tcp    # dbref
-#			   Yoshihiro Yamazaki &lt;yamazaki@ael.fujitsu.co.jp&gt;
-qip-login	2366/udp    # qip-login
-qip-login	2366/tcp    # qip-login
-#			   Mike Morgan &lt;mmorgan@lucent.com&gt;
-service-ctrl	2367/udp    # Service Control
-service-ctrl	2367/tcp    # Service Control
-#			   Humberto Sanchez &lt;Humberto_Sanchez@hp.com&gt;
-opentable	2368/udp    # OpenTable
-opentable	2368/tcp    # OpenTable
-#			   Thomas Theobald &lt;ttheobald@opentable.com&gt;
-acs2000-dsp	2369/udp    # ACS2000 DSP
-acs2000-dsp	2369/tcp    # ACS2000 DSP
-#			   Jeffrey Beauchamp &lt;jeffrey.beauchamp@acs2000.net&gt;
-l3-hbmon	2370/udp    # L3-HBMon
-l3-hbmon	2370/tcp    # L3-HBMon
-#			   Dolores Scott &lt;Dolores.Scott@L-3security.com&gt;
+#                          shivakumar s. govindarajapuram &lt;shivak@eng.sun.com&gt;
+oi-2000         2364/udp    # OI-2000
+oi-2000         2364/tcp    # OI-2000
+#                          Software Horizons Inc. &lt;oi2000@shorizons.com&gt;
+dbref           2365/udp    # dbref
+dbref           2365/tcp    # dbref
+#                          Yoshihiro Yamazaki &lt;yamazaki@ael.fujitsu.co.jp&gt;
+qip-login       2366/udp    # qip-login
+qip-login       2366/tcp    # qip-login
+#                          Mike Morgan &lt;mmorgan@lucent.com&gt;
+service-ctrl    2367/udp    # Service Control
+service-ctrl    2367/tcp    # Service Control
+#                          Humberto Sanchez &lt;Humberto_Sanchez@hp.com&gt;
+opentable       2368/udp    # OpenTable
+opentable       2368/tcp    # OpenTable
+#                          Thomas Theobald &lt;ttheobald@opentable.com&gt;
+acs2000-dsp     2369/udp    # ACS2000 DSP
+acs2000-dsp     2369/tcp    # ACS2000 DSP
+#                          Jeffrey Beauchamp &lt;jeffrey.beauchamp@acs2000.net&gt;
+l3-hbmon        2370/udp    # L3-HBMon
+l3-hbmon        2370/tcp    # L3-HBMon
+#                          Dolores Scott &lt;Dolores.Scott@L-3security.com&gt;
 #### Port 2370 Unofficially used by Compaq ####
 worldwire       2371/udp    # Compaq WorldWire Port
 worldwire       2371/tcp    # Compaq WorldWire Port
@@ -5359,134 +5359,134 @@ worldwire       2371/tcp    # Compaq WorldWire Port
 compaq-https    2381/udp    # Compaq HTTPS
 compaq-https    2381/tcp    # Compaq HTTPS
 #                          Scott Shaffer &lt;scott.shaffer@hp.com&gt;
-ms-olap3	2382/udp    # Microsoft OLAP
-ms-olap3	2382/tcp    # Microsoft OLAP
-ms-olap4	2383/udp    # Microsoft OLAP
-ms-olap4	2383/tcp    # Microsoft OLAP
-#			   Mosha Pasumansky &lt;moshap@microsoft.com&gt;
+ms-olap3        2382/udp    # Microsoft OLAP
+ms-olap3        2382/tcp    # Microsoft OLAP
+ms-olap4        2383/udp    # Microsoft OLAP
+ms-olap4        2383/tcp    # Microsoft OLAP
+#                          Mosha Pasumansky &lt;moshap@microsoft.com&gt;
 sd-capacity     2384/udp    # SD-CAPACITY
 sd-request      2384/tcp    # SD-REQUEST
 #                          Jason McManus &lt;jasonm@sleepdep.net&gt;
 sd-data         2385/udp    # SD-DATA
 sd-data         2385/tcp    # SD-DATA
 #                          Jason McManus &lt;jasonm@sleepdep.net&gt;
-virtualtape	2386/udp    # Virtual Tape
-virtualtape	2386/tcp    # Virtual Tape
+virtualtape     2386/udp    # Virtual Tape
+virtualtape     2386/tcp    # Virtual Tape
 vsamredirector  2387/udp    # VSAM Redirector
 vsamredirector  2387/tcp    # VSAM Redirector
 #                          Ingo Franzki &lt;ifranzki@de.ibm.com&gt;
 mynahautostart  2388/udp    # MYNAH AutoStart
 mynahautostart  2388/tcp    # MYNAH AutoStart
 #                          Thomas J. Klehr &lt;tklehr@telcordia.com&gt;
-ovsessionmgr	2389/udp    # OpenView Session Mgr
-ovsessionmgr	2389/tcp    # OpenView Session Mgr
-#			   Eric Pulsipher &lt;eric_pulsipher@hp.com&gt;
-rsmtp		2390/udp    # RSMTP
-rsmtp		2390/tcp    # RSMTP
-#			   Geoff Collyer &lt;geoff@research.bell-labs.com&gt;
-3com-net-mgmt	2391/udp    # 3COM Net Management
-3com-net-mgmt	2391/tcp    # 3COM Net Management
-#			   Prathibha Nagvar
-tacticalauth	2392/udp    # Tactical Auth
-tacticalauth	2392/tcp    # Tactical Auth
-#			   David Yon &lt;yon@tactical-sw.com&gt;   
-ms-olap1	2393/udp    # MS OLAP 1
-ms-olap1	2393/tcp    # MS OLAP 1
-ms-olap2	2394/udp    # MS OLAP 2
-ms-olap2	2394/tcp    # MS OLAP 2
-#			   Mosha Pasumansky &lt;moshap@microsoft.com&gt;
-lan900_remote	2395/udp    # LAN900 Remote
-lan900_remote	2395/tcp    # LAN900 Remote
-#			   Tom Quinlan &lt;tquinlan@digitechinc.com&gt;
-wusage 		2396/udp    # Wusage
-wusage		2396/tcp    # Wusage
-#			   Thomas Boutell &lt;boutell@boutell.com&gt;
-ncl		2397/udp    # NCL
-ncl		2397/tcp    # NCL
-#			   Robert Wiebe &lt;crw010@email.mot.com&gt;
-orbiter		2398/udp    # Orbiter
-orbiter		2398/tcp    # Orbiter
-#			   David Goldberg &lt;dgoldberg@callisto.com&gt;
-fmpro-fdal	2399/udp    # FileMaker, Inc. - Data Access Layer
-fmpro-fdal	2399/tcp    # FileMaker, Inc. - Data Access Layer
-#			   Clay Maeckal &lt;clay_maeckel@filemaker.com&gt;
-opequus-server	2400/udp    # OpEquus Server
-opequus-server	2400/tcp    # OpEquus Server
-#			   Gavin Hutchinson &lt;gavinh@tesl.com&gt;
+ovsessionmgr    2389/udp    # OpenView Session Mgr
+ovsessionmgr    2389/tcp    # OpenView Session Mgr
+#                          Eric Pulsipher &lt;eric_pulsipher@hp.com&gt;
+rsmtp           2390/udp    # RSMTP
+rsmtp           2390/tcp    # RSMTP
+#                          Geoff Collyer &lt;geoff@research.bell-labs.com&gt;
+3com-net-mgmt   2391/udp    # 3COM Net Management
+3com-net-mgmt   2391/tcp    # 3COM Net Management
+#                          Prathibha Nagvar
+tacticalauth    2392/udp    # Tactical Auth
+tacticalauth    2392/tcp    # Tactical Auth
+#                          David Yon &lt;yon@tactical-sw.com&gt;
+ms-olap1        2393/udp    # MS OLAP 1
+ms-olap1        2393/tcp    # MS OLAP 1
+ms-olap2        2394/udp    # MS OLAP 2
+ms-olap2        2394/tcp    # MS OLAP 2
+#                          Mosha Pasumansky &lt;moshap@microsoft.com&gt;
+lan900_remote   2395/udp    # LAN900 Remote
+lan900_remote   2395/tcp    # LAN900 Remote
+#                          Tom Quinlan &lt;tquinlan@digitechinc.com&gt;
+wusage          2396/udp    # Wusage
+wusage          2396/tcp    # Wusage
+#                          Thomas Boutell &lt;boutell@boutell.com&gt;
+ncl             2397/udp    # NCL
+ncl             2397/tcp    # NCL
+#                          Robert Wiebe &lt;crw010@email.mot.com&gt;
+orbiter         2398/udp    # Orbiter
+orbiter         2398/tcp    # Orbiter
+#                          David Goldberg &lt;dgoldberg@callisto.com&gt;
+fmpro-fdal      2399/udp    # FileMaker, Inc. - Data Access Layer
+fmpro-fdal      2399/tcp    # FileMaker, Inc. - Data Access Layer
+#                          Clay Maeckal &lt;clay_maeckel@filemaker.com&gt;
+opequus-server  2400/udp    # OpEquus Server
+opequus-server  2400/tcp    # OpEquus Server
+#                          Gavin Hutchinson &lt;gavinh@tesl.com&gt;
 cvspserver      2401/udp    # cvspserver
 cvspserver      2401/tcp    # cvspserver
 #                          Jim Kingdon &lt;kingdon@harvey.cyclic.com&gt;
-taskmaster2000	2402/udp    # TaskMaster 2000 Server
-taskmaster2000	2402/tcp    # TaskMaster 2000 Server
-taskmaster2000	2403/udp    # TaskMaster 2000 Web
-taskmaster2000	2403/tcp    # TaskMaster 2000 Web
-#			   Ed Odjaghian &lt;edo@datacap.com&gt;
+taskmaster2000  2402/udp    # TaskMaster 2000 Server
+taskmaster2000  2402/tcp    # TaskMaster 2000 Server
+taskmaster2000  2403/udp    # TaskMaster 2000 Web
+taskmaster2000  2403/tcp    # TaskMaster 2000 Web
+#                          Ed Odjaghian &lt;edo@datacap.com&gt;
 iec-104         2404/udp    # IEC 60870-5-104 process control over IP
 iec-104         2404/tcp    # IEC 60870-5-104 process control over IP
 #                          Walter K. Eichelburg &lt;walter.eichelburg@sat-automation.com&gt;
-trc-netpoll	2405/udp    # TRC Netpoll
-trc-netpoll	2405/tcp    # TRC Netpoll
-#			   Bizhan Ghavami &lt;ghavami@telcores.com&gt;
-jediserver	2406/udp    # JediServer
-jediserver	2406/tcp    # JediServer
-#			   Paul McEntire &lt;paul.mcentire@columbiasc.ncr.com&gt;
+trc-netpoll     2405/udp    # TRC Netpoll
+trc-netpoll     2405/tcp    # TRC Netpoll
+#                          Bizhan Ghavami &lt;ghavami@telcores.com&gt;
+jediserver      2406/udp    # JediServer
+jediserver      2406/tcp    # JediServer
+#                          Paul McEntire &lt;paul.mcentire@columbiasc.ncr.com&gt;
 orion           2407/udp    # Orion
 orion           2407/tcp    # Orion
 #                          Matthew Horoschun &lt;mhoroschun@canprint.com.au&gt;
-optimanet	2408/udp    # OptimaNet
-optimanet	2408/tcp    # OptimaNet
-#			   John Graham-Cumming &lt;jgc@optimal.com&gt;
-sns-protocol	2409/udp    # SNS Protocol
-sns-protocol	2409/tcp    # SNS Protocol
-#			   Amir Blich &lt;amir@netmanage.co.il&gt;
-vrts-registry	2410/udp    # VRTS Registry
-vrts-registry	2410/tcp    # VRTS Registry
-#			   Pranay Varma &lt;pran@veritas.com&gt;
-netwave-ap-mgmt	2411/udp    # Netwave AP Management
-netwave-ap-mgmt	2411/tcp    # Netwave AP Management
-#			   Johnny Zweig &lt;zweig@netwave-wireless.com&gt;
-cdn		2412/udp    # CDN
-cdn		2412/tcp    # CDN
-#			   Alan Noble &lt;noble@netmind.com&gt;
-orion-rmi-reg	2413/udp    # orion-rmi-reg
-orion-rmi-reg	2413/tcp    # orion-rmi-reg 
-#			   J.S. Greenfield &lt;greeny@us.ibm.com&gt;
-beeyond		2414/udp    # Beeyond
-beeyond		2414/tcp    # Beeyond
-#			   Bob Deblier &lt;bob@virtualunlimited.com&gt;
+optimanet       2408/udp    # OptimaNet
+optimanet       2408/tcp    # OptimaNet
+#                          John Graham-Cumming &lt;jgc@optimal.com&gt;
+sns-protocol    2409/udp    # SNS Protocol
+sns-protocol    2409/tcp    # SNS Protocol
+#                          Amir Blich &lt;amir@netmanage.co.il&gt;
+vrts-registry   2410/udp    # VRTS Registry
+vrts-registry   2410/tcp    # VRTS Registry
+#                          Pranay Varma &lt;pran@veritas.com&gt;
+netwave-ap-mgmt 2411/udp    # Netwave AP Management
+netwave-ap-mgmt 2411/tcp    # Netwave AP Management
+#                          Johnny Zweig &lt;zweig@netwave-wireless.com&gt;
+cdn             2412/udp    # CDN
+cdn             2412/tcp    # CDN
+#                          Alan Noble &lt;noble@netmind.com&gt;
+orion-rmi-reg   2413/udp    # orion-rmi-reg
+orion-rmi-reg   2413/tcp    # orion-rmi-reg
+#                          J.S. Greenfield &lt;greeny@us.ibm.com&gt;
+beeyond         2414/udp    # Beeyond
+beeyond         2414/tcp    # Beeyond
+#                          Bob Deblier &lt;bob@virtualunlimited.com&gt;
 codima-rtp      2415/udp    # Codima Remote Transaction Protocol
 codima-rtp      2415/tcp    # Codima Remote Transaction Protocol
 #                          Sylvia Ross &lt;sross@codimatech.com&gt;
-rmtserver	2416/udp    # RMT Server
-rmtserver	2416/tcp    # RMT Server	
-#			   Yvon Marineau &lt;yvon@simware.com&gt;
-composit-server	2417/udp    # Composit Server
-composit-server	2417/tcp    # Composit Server
-#			   Katsuaki Naoi &lt;naoi@pfu.co.jp&gt;
-cas		2418/udp    # cas
-cas		2418/tcp    # cas
-#			   Akiyoshi Ochi &lt;akiyoshi@net.paso.fujitsu.co.jp&gt;
-attachmate-s2s	2419/udp    # Attachmate S2S
-attachmate-s2s	2419/tcp    # Attachmate S2S
-#			   Chris Rominski &lt;ChrisRom@attachmate.com&gt;
-dslremote-mgmt	2420/udp    # DSL Remote Management
-dslremote-mgmt	2420/tcp    # DSL Remote Management
-#			   Westell, Inc. &lt;jronk@westell.com&gt; 	
-g-talk		2421/udp    # G-Talk
-g-talk		2421/tcp    # G-Talk
-#			   Matt Hammond &lt;matt_hammond@four-sight.co.uk&gt;
-crmsbits	2422/udp    # CRMSBITS
-crmsbits	2422/tcp    # CRMSBITS
-#			   Rod Ward &lt;RWard@vaccmel1.telstra.com.au&gt;
-rnrp		2423/udp    # RNRP
-rnrp		2423/tcp    # RNRP
-#			   Per Sahlqvist &lt;psahlqvi@sw.seisy.abb.se&gt;
-kofax-svr	2424/udp    # KOFAX-SVR
-kofax-svr	2424/tcp    # KOFAX-SVR
-#			   Terry Reagan &lt;treagan@kofax.com&gt;
-fjitsuappmgr	2425/udp    # Fujitsu App Manager
-fjitsuappmgr	2425/tcp    # Fujitsu App Manager
-#			   Hiroyuki Kawabuchi &lt;buchi@ael.fujitsu.co.jp&gt;
+rmtserver       2416/udp    # RMT Server
+rmtserver       2416/tcp    # RMT Server
+#                          Yvon Marineau &lt;yvon@simware.com&gt;
+composit-server 2417/udp    # Composit Server
+composit-server 2417/tcp    # Composit Server
+#                          Katsuaki Naoi &lt;naoi@pfu.co.jp&gt;
+cas             2418/udp    # cas
+cas             2418/tcp    # cas
+#                          Akiyoshi Ochi &lt;akiyoshi@net.paso.fujitsu.co.jp&gt;
+attachmate-s2s  2419/udp    # Attachmate S2S
+attachmate-s2s  2419/tcp    # Attachmate S2S
+#                          Chris Rominski &lt;ChrisRom@attachmate.com&gt;
+dslremote-mgmt  2420/udp    # DSL Remote Management
+dslremote-mgmt  2420/tcp    # DSL Remote Management
+#                          Westell, Inc. &lt;jronk@westell.com&gt;
+g-talk          2421/udp    # G-Talk
+g-talk          2421/tcp    # G-Talk
+#                          Matt Hammond &lt;matt_hammond@four-sight.co.uk&gt;
+crmsbits        2422/udp    # CRMSBITS
+crmsbits        2422/tcp    # CRMSBITS
+#                          Rod Ward &lt;RWard@vaccmel1.telstra.com.au&gt;
+rnrp            2423/udp    # RNRP
+rnrp            2423/tcp    # RNRP
+#                          Per Sahlqvist &lt;psahlqvi@sw.seisy.abb.se&gt;
+kofax-svr       2424/udp    # KOFAX-SVR
+kofax-svr       2424/tcp    # KOFAX-SVR
+#                          Terry Reagan &lt;treagan@kofax.com&gt;
+fjitsuappmgr    2425/udp    # Fujitsu App Manager
+fjitsuappmgr    2425/tcp    # Fujitsu App Manager
+#                          Hiroyuki Kawabuchi &lt;buchi@ael.fujitsu.co.jp&gt;
 #               2426       Unassigned (Removed 2002-04-29)
 mgcp-gateway    2427/udp    # Media Gateway Control Protocol Gateway
 mgcp-gateway    2427/tcp    # Media Gateway Control Protocol Gateway
@@ -5494,418 +5494,418 @@ mgcp-gateway    2427/tcp    # Media Gateway Control Protocol Gateway
 ott             2428/udp    # One Way Trip Time
 ott             2428/tcp    # One Way Trip Time
 #                          Greg Troxel &lt;gdt@ir.bbn.com&gt;
-ft-role		2429/udp    # FT-ROLE
-ft-role		2429/tcp    # FT-ROLE
-#			   Doug Boone &lt;dboone@atg.CLR.com&gt;
-venus		2430/udp    # venus
-venus		2430/tcp    # venus
-venus-se	2431/udp    # venus-se
-venus-se	2431/tcp    # venus-se
-codasrv		2432/udp    # codasrv
-codasrv		2432/tcp    # codasrv
-codasrv-se	2433/udp    # codasrv-se
-codasrv-se	2433/tcp    # codasrv-se
-#			   Robert Watson &lt;robert@cyrus.watson.org&gt;
-pxc-epmap	2434/udp    # pxc-epmap
-pxc-epmap	2434/tcp    # pxc-epmap
-#			   Jun Nakamura &lt;jnakamur@cp10.es.xerox.com&gt;
-optilogic	2435/udp    # OptiLogic
-optilogic	2435/tcp    # OptiLogic
-#			   Clark Williams &lt;clark@wirespeed.com&gt;
-topx		2436/udp    # TOP/X
-topx		2436/tcp    # TOP/X
-#			   Dragos Pop &lt;dragos@cs.ubbcluj.ro&gt;
-unicontrol	2437/udp    # UniControl
-unicontrol	2437/tcp    # UniControl
-#			   Ing. Markus Huemer &lt;markus.huemer@hsd.at&gt;
-msp		2438/udp    # MSP
-msp		2438/tcp    # MSP
-#			   Evan Caves &lt;evan@acc.com&gt;
-sybasedbsynch	2439/udp    # SybaseDBSynch
-sybasedbsynch	2439/tcp    # SybaseDBSynch
-#			   Dave Neudoerffer &lt;Dave.Neudoerffer@ianywhere.com&gt;
-spearway	2440/udp    # Spearway Lockers
-spearway	2440/tcp    # Spearway Lockers
-#			   Pierre Frisch &lt;Pierre.Frisch@spearway.com&gt;
+ft-role         2429/udp    # FT-ROLE
+ft-role         2429/tcp    # FT-ROLE
+#                          Doug Boone &lt;dboone@atg.CLR.com&gt;
+venus           2430/udp    # venus
+venus           2430/tcp    # venus
+venus-se        2431/udp    # venus-se
+venus-se        2431/tcp    # venus-se
+codasrv         2432/udp    # codasrv
+codasrv         2432/tcp    # codasrv
+codasrv-se      2433/udp    # codasrv-se
+codasrv-se      2433/tcp    # codasrv-se
+#                          Robert Watson &lt;robert@cyrus.watson.org&gt;
+pxc-epmap       2434/udp    # pxc-epmap
+pxc-epmap       2434/tcp    # pxc-epmap
+#                          Jun Nakamura &lt;jnakamur@cp10.es.xerox.com&gt;
+optilogic       2435/udp    # OptiLogic
+optilogic       2435/tcp    # OptiLogic
+#                          Clark Williams &lt;clark@wirespeed.com&gt;
+topx            2436/udp    # TOP/X
+topx            2436/tcp    # TOP/X
+#                          Dragos Pop &lt;dragos@cs.ubbcluj.ro&gt;
+unicontrol      2437/udp    # UniControl
+unicontrol      2437/tcp    # UniControl
+#                          Ing. Markus Huemer &lt;markus.huemer@hsd.at&gt;
+msp             2438/udp    # MSP
+msp             2438/tcp    # MSP
+#                          Evan Caves &lt;evan@acc.com&gt;
+sybasedbsynch   2439/udp    # SybaseDBSynch
+sybasedbsynch   2439/tcp    # SybaseDBSynch
+#                          Dave Neudoerffer &lt;Dave.Neudoerffer@ianywhere.com&gt;
+spearway        2440/udp    # Spearway Lockers
+spearway        2440/tcp    # Spearway Lockers
+#                          Pierre Frisch &lt;Pierre.Frisch@spearway.com&gt;
 pvsw-inet       2441/udp    # Pervasive I*net Data Server
 pvsw-inet       2441/tcp    # Pervasive I*net Data Server
 #                          Chuck Talk &lt;ctalk@pervasive.com&gt;
-netangel	2442/udp    # Netangel
-netangel	2442/tcp    # Netangel
-#			   Ladislav Baranyay &lt;identcod@identcode.sk&gt;
+netangel        2442/udp    # Netangel
+netangel        2442/tcp    # Netangel
+#                          Ladislav Baranyay &lt;identcod@identcode.sk&gt;
 powerclientcsf  2443/udp    # PowerClient Central Storage Facility
 powerclientcsf  2443/tcp    # PowerClient Central Storage Facility
-#			   Brian Klassen &lt;Brian.Klassen@Unisys.com&gt;	
+#                          Brian Klassen &lt;Brian.Klassen@Unisys.com&gt;
 btpp2sectrans   2444/udp    # BT PP2 Sectrans
 btpp2sectrans   2444/tcp    # BT PP2 Sectrans
 #                          Ian Daniels &lt;btexact.ports@bt.com&gt; 
-dtn1		2445/udp    # DTN1
-dtn1		2445/tcp    # DTN1
-#			   Bob Gaddie &lt;bobg@dtn.com&gt; 
-bues_service	2446/udp    # bues_service
-bues_service	2446/tcp    # bues_service
-#			   Leonhard Diekmann
+dtn1            2445/udp    # DTN1
+dtn1            2445/tcp    # DTN1
+#                          Bob Gaddie &lt;bobg@dtn.com&gt;
+bues_service    2446/udp    # bues_service
+bues_service    2446/tcp    # bues_service
+#                          Leonhard Diekmann
 #                          &lt;diekmann@04.mstr02.telekom400.dbp.de&gt;
-ovwdb		2447/udp    # OpenView NNM daemon
-ovwdb		2447/tcp    # OpenView NNM daemon
-#			   Eric Pulsipher &lt;eric_pulsipher@fc.hp.com&gt;
-hpppssvr	2448/udp    # hpppsvr
-hpppssvr	2448/tcp    # hpppsvr
-#			   Bridgette Landers &lt;blanders@boi.hp.com&gt;
-ratl		2449/udp    # RATL
-ratl		2449/tcp    # RATL
-#			   Paul Greenfield &lt;paul.greenfield@unisys.com&gt;
-netadmin	2450/udp    # netadmin
-netadmin	2450/tcp    # netadmin
-netchat		2451/udp    # netchat
-netchat		2451/tcp    # netchat
-#			   Julian Mehnle &lt;julian@mehnle.net&gt;
-snifferclient	2452/udp    # SnifferClient
-snifferclient	2452/tcp    # SnifferClient
-#			   Amy Weaver &lt;amy_weaver@nai.com&gt;
-madge-om	2453/udp    # madge-om
-madge-om	2453/tcp    # madge-om
-#			   Andrew Draper &lt;adraper@dev.madge.com&gt;
-indx-dds	2454/udp    # IndX-DDS
-indx-dds	2454/tcp    # IndX-DDS
-#			   Paul Carmichael &lt;paulcarmichael@indx.net&gt;
-wago-io-system	2455/udp    # WAGO-IO-SYSTEM
-wago-io-system	2455/tcp    # WAGO-IO-SYSTEM
-#			   Uwe Rathert &lt;uwe.rathert@ieee.org&gt;
-altav-remmgt	2456/udp    # altav-remmgt
-altav-remmgt	2456/tcp    # altav-remmgt
-#			   Gary M. Allen &lt;gallen@symantec.com&gt;
-rapido-ip	2457/udp    # Rapido_IP
-rapido-ip	2457/tcp    # Rapido_IP
-#			   Man Shuen Cheung &lt;man_shuen_cheung@wamnet.co.uk&gt;
-griffin		2458/udp    # griffin
-griffin		2458/tcp    # griffin
-#			   Tom Taylor &lt;Tom.Taylor@unisys.com&gt;
-community	2459/udp    # Community
-community	2459/tcp    # Community
-#			   David Schwartz &lt;davids@webmaster.com&gt;
-ms-theater	2460/udp    # ms-theater
-ms-theater	2460/tcp    # ms-theater
-#			   Anton Kucer &lt;a-antonk@microsoft.com&gt;
-qadmifoper	2461/udp    # qadmifoper
-qadmifoper	2461/tcp    # qadmifoper
-qadmifevent	2462/udp    # qadmifevent	
-qadmifevent	2462/tcp    # qadmifevent
-#			   Pekka Takaranta &lt;pekka.takaranta@tellabs.fi&gt;
-symbios-raid	2463/udp    # Symbios Raid
-symbios-raid	2463/tcp    # Symbios Raid
-#			   Bill Delaney &lt;bill.delaney@symbios.com&gt;
-direcpc-si	2464/udp    # DirecPC SI
-direcpc-si	2464/tcp    # DirecPC SI
-#			   Doug Dillon &lt;dillon@hns.com&gt;
-lbm		2465/udp    # Load Balance Management
-lbm		2465/tcp    # Load Balance Management
-lbf		2466/udp    # Load Balance Forwarding
-lbf		2466/tcp    # Load Balance Forwarding
-#			   Kazuhiro Koide &lt;kaz@pfu.co.jp&gt;
-high-criteria	2467/udp    # High Criteria
-high-criteria	2467/tcp    # High Criteria
-#			   Konstantin Iavid &lt;kiavid@highcriteria.com&gt;
-qip-msgd	2468/udp    # qip_msgd
-qip-msgd	2468/tcp    # qip_msgd
-#			   Mike Morgan &lt;mmorgan@lucent.com&gt;
-mti-tcs-comm	2469/udp    # MTI-TCS-COMM
-mti-tcs-comm	2469/tcp    # MTI-TCS-COMM
-#			   Mario Bonin &lt;boninm@microtempus.com&gt;
-taskman-port	2470/udp    # taskman port
-taskman-port	2470/tcp    # taskman port
-#			   Boris Panteleev &lt;bpanteleev@himel.com&gt;
-seaodbc		2471/udp    # SeaODBC
-seaodbc		2471/tcp    # SeaODBC
-#			   Adrian Hornby &lt;Adrian.Hornby@aran.co.uk&gt;
-c3		2472/udp    # C3
-c3		2472/tcp    # C3
-#			   Eckhard Grieger &lt;e.grieger@com-on.de&gt;
-aker-cdp	2473/udp    # Aker-cdp
-aker-cdp	2473/tcp    # Aker-cdp
-#			   Rodrigo Ormonde &lt;ormonde@aker.com.br&gt;
-vitalanalysis	2474/udp    # Vital Analysis
-vitalanalysis	2474/tcp    # Vital Analysis
-#			   Srinivas Reddy &lt;sreddy@vitalsigns.com&gt;
-ace-server	2475/udp    # ACE Server
-ace-server	2475/tcp    # ACE Server
-ace-svr-prop	2476/udp    # ACE Server Propagation
-ace-svr-prop	2476/tcp    # ACE Server Propagation
-ssm-cvs		2477/udp    # SecurSight Certificate Valifation Service
-ssm-cvs		2477/tcp    # SecurSight Certificate Valifation Service
-ssm-cssps	2478/udp    # SecurSight Authentication Server (SSL)
-ssm-cssps	2478/tcp    # SecurSight Authentication Server (SSL)
-ssm-els		2479/udp    # SecurSight Event Logging Server (SSL)
-ssm-els		2479/tcp    # SecurSight Event Logging Server (SSL)
-#			   John Linn &lt;jlinn@securitydynamics.com&gt;
-lingwood	2480/udp    # Lingwood's Detail
-lingwood	2480/tcp    # Lingwood's Detail
-#			   Dave Richmond &lt;drichmond@striva.com&gt;
-giop		2481/udp    # Oracle GIOP
-giop		2481/tcp    # Oracle GIOP
-giop-ssl	2482/udp    # Oracle GIOP SSL
-giop-ssl	2482/tcp    # Oracle GIOP SSL
-ttc		2483/udp    # Oracle TTC
-ttc		2483/tcp    # Oracle TTC
-ttc-ssl		2484/udp    # Oracle TTC SSL
-ttc-ssl		2484/tcp    # Oracle TTC SSL
-#			   Chandar Venkataraman &lt;CVENKATA@us.oracle.com&gt;
-netobjects1	2485/udp    # Net Objects1
-netobjects1	2485/tcp    # Net Objects1
-netobjects2	2486/udp    # Net Objects2
-netobjects2	2486/tcp    # Net Objects2
-#			   Francois Granade &lt;francois@netobjects.com&gt;
-pns		2487/udp    # Policy Notice Service
-pns		2487/tcp    # Policy Notice Service
-#			   Akiyoshi Ochi &lt;akiyoshi@net.paso.fujitsu.co.jp&gt;
-moy-corp	2488/udp    # Moy Corporation
-moy-corp	2488/tcp    # Moy Corporation
-#			   Gang Gong Moy
-tsilb		2489/udp    # TSILB
-tsilb		2489/tcp    # TSILB
-#			   James Irwin &lt;jimi@travsoft.com&gt;
-qip-qdhcp	2490/udp    # qip_qdhcp
-qip-qdhcp	2490/tcp    # qip_qdhcp
-#			   Mike Morgan &lt;mmorgan@lucent.com&gt;
-conclave-cpp	2491/udp    # Conclave CPP
-conclave-cpp	2491/tcp    # Conclave CPP
-#			   Larry Lipstone &lt;lrl@interdyn.com&gt;
-groove		2492/udp    # GROOVE
-groove		2492/tcp    # GROOVE
-#			   Ray Ozzie &lt;ray@rocks.net&gt;
-talarian-mqs	2493/udp    # Talarian MQS
-talarian-mqs	2493/tcp    # Talarian MQS
-#			   Jim Stabile &lt;jstabile@talarian.com&gt;
-bmc-ar		2494/udp    # BMC AR
-bmc-ar		2494/tcp    # BMC AR
-#			   Shelia Childs &lt;sheila_childs@bmc.com&gt;
-fast-rem-serv	2495/udp    # Fast Remote Services
-fast-rem-serv	2495/tcp    # Fast Remote Services
-#			   Scott St. Clair &lt;stclair@NTC.ADAPTEC.com&gt;
-dirgis		2496/udp    # DIRGIS
-dirgis		2496/tcp    # DIRGIS
-#			   Deutschland Informations- und
+ovwdb           2447/udp    # OpenView NNM daemon
+ovwdb           2447/tcp    # OpenView NNM daemon
+#                          Eric Pulsipher &lt;eric_pulsipher@fc.hp.com&gt;
+hpppssvr        2448/udp    # hpppsvr
+hpppssvr        2448/tcp    # hpppsvr
+#                          Bridgette Landers &lt;blanders@boi.hp.com&gt;
+ratl            2449/udp    # RATL
+ratl            2449/tcp    # RATL
+#                          Paul Greenfield &lt;paul.greenfield@unisys.com&gt;
+netadmin        2450/udp    # netadmin
+netadmin        2450/tcp    # netadmin
+netchat         2451/udp    # netchat
+netchat         2451/tcp    # netchat
+#                          Julian Mehnle &lt;julian@mehnle.net&gt;
+snifferclient   2452/udp    # SnifferClient
+snifferclient   2452/tcp    # SnifferClient
+#                          Amy Weaver &lt;amy_weaver@nai.com&gt;
+madge-om        2453/udp    # madge-om
+madge-om        2453/tcp    # madge-om
+#                          Andrew Draper &lt;adraper@dev.madge.com&gt;
+indx-dds        2454/udp    # IndX-DDS
+indx-dds        2454/tcp    # IndX-DDS
+#                          Paul Carmichael &lt;paulcarmichael@indx.net&gt;
+wago-io-system  2455/udp    # WAGO-IO-SYSTEM
+wago-io-system  2455/tcp    # WAGO-IO-SYSTEM
+#                          Uwe Rathert &lt;uwe.rathert@ieee.org&gt;
+altav-remmgt    2456/udp    # altav-remmgt
+altav-remmgt    2456/tcp    # altav-remmgt
+#                          Gary M. Allen &lt;gallen@symantec.com&gt;
+rapido-ip       2457/udp    # Rapido_IP
+rapido-ip       2457/tcp    # Rapido_IP
+#                          Man Shuen Cheung &lt;man_shuen_cheung@wamnet.co.uk&gt;
+griffin         2458/udp    # griffin
+griffin         2458/tcp    # griffin
+#                          Tom Taylor &lt;Tom.Taylor@unisys.com&gt;
+community       2459/udp    # Community
+community       2459/tcp    # Community
+#                          David Schwartz &lt;davids@webmaster.com&gt;
+ms-theater      2460/udp    # ms-theater
+ms-theater      2460/tcp    # ms-theater
+#                          Anton Kucer &lt;a-antonk@microsoft.com&gt;
+qadmifoper      2461/udp    # qadmifoper
+qadmifoper      2461/tcp    # qadmifoper
+qadmifevent     2462/udp    # qadmifevent
+qadmifevent     2462/tcp    # qadmifevent
+#                          Pekka Takaranta &lt;pekka.takaranta@tellabs.fi&gt;
+symbios-raid    2463/udp    # Symbios Raid
+symbios-raid    2463/tcp    # Symbios Raid
+#                          Bill Delaney &lt;bill.delaney@symbios.com&gt;
+direcpc-si      2464/udp    # DirecPC SI
+direcpc-si      2464/tcp    # DirecPC SI
+#                          Doug Dillon &lt;dillon@hns.com&gt;
+lbm             2465/udp    # Load Balance Management
+lbm             2465/tcp    # Load Balance Management
+lbf             2466/udp    # Load Balance Forwarding
+lbf             2466/tcp    # Load Balance Forwarding
+#                          Kazuhiro Koide &lt;kaz@pfu.co.jp&gt;
+high-criteria   2467/udp    # High Criteria
+high-criteria   2467/tcp    # High Criteria
+#                          Konstantin Iavid &lt;kiavid@highcriteria.com&gt;
+qip-msgd        2468/udp    # qip_msgd
+qip-msgd        2468/tcp    # qip_msgd
+#                          Mike Morgan &lt;mmorgan@lucent.com&gt;
+mti-tcs-comm    2469/udp    # MTI-TCS-COMM
+mti-tcs-comm    2469/tcp    # MTI-TCS-COMM
+#                          Mario Bonin &lt;boninm@microtempus.com&gt;
+taskman-port    2470/udp    # taskman port
+taskman-port    2470/tcp    # taskman port
+#                          Boris Panteleev &lt;bpanteleev@himel.com&gt;
+seaodbc         2471/udp    # SeaODBC
+seaodbc         2471/tcp    # SeaODBC
+#                          Adrian Hornby &lt;Adrian.Hornby@aran.co.uk&gt;
+c3              2472/udp    # C3
+c3              2472/tcp    # C3
+#                          Eckhard Grieger &lt;e.grieger@com-on.de&gt;
+aker-cdp        2473/udp    # Aker-cdp
+aker-cdp        2473/tcp    # Aker-cdp
+#                          Rodrigo Ormonde &lt;ormonde@aker.com.br&gt;
+vitalanalysis   2474/udp    # Vital Analysis
+vitalanalysis   2474/tcp    # Vital Analysis
+#                          Srinivas Reddy &lt;sreddy@vitalsigns.com&gt;
+ace-server      2475/udp    # ACE Server
+ace-server      2475/tcp    # ACE Server
+ace-svr-prop    2476/udp    # ACE Server Propagation
+ace-svr-prop    2476/tcp    # ACE Server Propagation
+ssm-cvs         2477/udp    # SecurSight Certificate Valifation Service
+ssm-cvs         2477/tcp    # SecurSight Certificate Valifation Service
+ssm-cssps       2478/udp    # SecurSight Authentication Server (SSL)
+ssm-cssps       2478/tcp    # SecurSight Authentication Server (SSL)
+ssm-els         2479/udp    # SecurSight Event Logging Server (SSL)
+ssm-els         2479/tcp    # SecurSight Event Logging Server (SSL)
+#                          John Linn &lt;jlinn@securitydynamics.com&gt;
+lingwood        2480/udp    # Lingwood's Detail
+lingwood        2480/tcp    # Lingwood's Detail
+#                          Dave Richmond &lt;drichmond@striva.com&gt;
+giop            2481/udp    # Oracle GIOP
+giop            2481/tcp    # Oracle GIOP
+giop-ssl        2482/udp    # Oracle GIOP SSL
+giop-ssl        2482/tcp    # Oracle GIOP SSL
+ttc             2483/udp    # Oracle TTC
+ttc             2483/tcp    # Oracle TTC
+ttc-ssl         2484/udp    # Oracle TTC SSL
+ttc-ssl         2484/tcp    # Oracle TTC SSL
+#                          Chandar Venkataraman &lt;CVENKATA@us.oracle.com&gt;
+netobjects1     2485/udp    # Net Objects1
+netobjects1     2485/tcp    # Net Objects1
+netobjects2     2486/udp    # Net Objects2
+netobjects2     2486/tcp    # Net Objects2
+#                          Francois Granade &lt;francois@netobjects.com&gt;
+pns             2487/udp    # Policy Notice Service
+pns             2487/tcp    # Policy Notice Service
+#                          Akiyoshi Ochi &lt;akiyoshi@net.paso.fujitsu.co.jp&gt;
+moy-corp        2488/udp    # Moy Corporation
+moy-corp        2488/tcp    # Moy Corporation
+#                          Gang Gong Moy
+tsilb           2489/udp    # TSILB
+tsilb           2489/tcp    # TSILB
+#                          James Irwin &lt;jimi@travsoft.com&gt;
+qip-qdhcp       2490/udp    # qip_qdhcp
+qip-qdhcp       2490/tcp    # qip_qdhcp
+#                          Mike Morgan &lt;mmorgan@lucent.com&gt;
+conclave-cpp    2491/udp    # Conclave CPP
+conclave-cpp    2491/tcp    # Conclave CPP
+#                          Larry Lipstone &lt;lrl@interdyn.com&gt;
+groove          2492/udp    # GROOVE
+groove          2492/tcp    # GROOVE
+#                          Ray Ozzie &lt;ray@rocks.net&gt;
+talarian-mqs    2493/udp    # Talarian MQS
+talarian-mqs    2493/tcp    # Talarian MQS
+#                          Jim Stabile &lt;jstabile@talarian.com&gt;
+bmc-ar          2494/udp    # BMC AR
+bmc-ar          2494/tcp    # BMC AR
+#                          Shelia Childs &lt;sheila_childs@bmc.com&gt;
+fast-rem-serv   2495/udp    # Fast Remote Services
+fast-rem-serv   2495/tcp    # Fast Remote Services
+#                          Scott St. Clair &lt;stclair@NTC.ADAPTEC.com&gt;
+dirgis          2496/udp    # DIRGIS
+dirgis          2496/tcp    # DIRGIS
+#                          Deutschland Informations- und
 #                          Reservierungsgesellschaft mbH &lt;beratung@dirg.de&gt;
-quaddb		2497/udp    # Quad DB
-quaddb		2497/tcp    # Quad DB
-#			   Jeff Rosenthal &lt;jrosenthal@quad-sys.com&gt;
-odn-castraq	2498/udp    # ODN-CasTraq
-odn-castraq	2498/tcp    # ODN-CasTraq
-#			   Richard Hodges &lt;rh@source.net&gt;
-unicontrol	2499/udp    # UniControl
-unicontrol	2499/tcp    # UniControl
-#			   Ing. Markus Huemer
+quaddb          2497/udp    # Quad DB
+quaddb          2497/tcp    # Quad DB
+#                          Jeff Rosenthal &lt;jrosenthal@quad-sys.com&gt;
+odn-castraq     2498/udp    # ODN-CasTraq
+odn-castraq     2498/tcp    # ODN-CasTraq
+#                          Richard Hodges &lt;rh@source.net&gt;
+unicontrol      2499/udp    # UniControl
+unicontrol      2499/tcp    # UniControl
+#                          Ing. Markus Huemer
 rtsserv         2500/udp    # Resource Tracking system server
 rtsserv         2500/tcp    # Resource Tracking system server
 rtsclient       2501/udp    # Resource Tracking system client
 rtsclient       2501/tcp    # Resource Tracking system client
 #                          Aubrey Turner
 #                          &lt;S95525ta%etsuacad.bitnet@ETSUADMN.ETSU.EDU&gt;
-kentrox-prot	2502/udp    # Kentrox Protocol
-kentrox-prot	2502/tcp    # Kentrox Protocol
-#			   Anil Lakhwara &lt;anil_lakhwara@kentrox.com&gt;
-nms-dpnss	2503/udp    # NMS-DPNSS
-nms-dpnss	2503/tcp    # NMS-DPNSS
-#			   Jean-Christophe Desire
-#			   &lt;Jean-Christophe_Desire@NMS-Europe.com&gt;	
-wlbs		2504/udp    # WLBS 
-wlbs		2504/tcp    # WLBS 
-#			   William Bain &lt;bbain@microsoft.com&gt;
+kentrox-prot    2502/udp    # Kentrox Protocol
+kentrox-prot    2502/tcp    # Kentrox Protocol
+#                          Anil Lakhwara &lt;anil_lakhwara@kentrox.com&gt;
+nms-dpnss       2503/udp    # NMS-DPNSS
+nms-dpnss       2503/tcp    # NMS-DPNSS
+#                          Jean-Christophe Desire
+#                          &lt;Jean-Christophe_Desire@NMS-Europe.com&gt;
+wlbs            2504/udp    # WLBS
+wlbs            2504/tcp    # WLBS
+#                          William Bain &lt;bbain@microsoft.com&gt;
 #           2505       Removed (2002-06-14)
-jbroker		2506/udp    # jbroker
-jbroker		2506/tcp    # jbroker
-#			   Rohit Garg &lt;rohit@objectScape.com&gt;
-spock		2507/udp    # spock
-spock		2507/tcp    # spock
-#			   Jon A. Christopher &lt;jac8792@tamu.edu&gt;
-jdatastore	2508/udp    # JDataStore
-jdatastore	2508/tcp    # JDataStore
-#			   Tod Landis &lt;tlandis@inprise.com&gt;
-fjmpss		2509/udp    # fjmpss
-fjmpss		2509/tcp    # fjmpss
-#			   Makoto Watanabe &lt;makoto@saint.nm.fujitsu.co.jp&gt;
-fjappmgrbulk	2510/udp    # fjappmgrbulk
-fjappmgrbulk	2510/tcp    # fjappmgrbulk
-#			   Hiroyuki Kawabuchi &lt;buchi@ael.fujitsu.co.jp&gt;
-metastorm	2511/udp    # Metastorm
-metastorm	2511/tcp    # Metastorm
-#			   Eric Isom &lt;eisom@metastorm.com&gt;
-citrixima	2512/udp    # Citrix IMA
-citrixima	2512/tcp    # Citrix IMA
-citrixadmin	2513/udp    # Citrix ADMIN
-citrixadmin	2513/tcp    # Citrix ADMIN
-#			   Myk Willis &lt;myk.willis@citrix.com&gt;
-facsys-ntp	2514/udp    # Facsys NTP
-facsys-ntp	2514/tcp    # Facsys NTP
-facsys-router	2515/udp    # Facsys Router
-facsys-router	2515/tcp    # Facsys Router
-#			   Jeff Hoffman &lt;jeffh@facsys.com&gt;
-maincontrol	2516/udp    # Main Control   
-maincontrol	2516/tcp    # Main Control   
-#			   Nathan Sadia &lt;sadia@maincontrol.com&gt;	
-call-sig-trans	2517/udp    # H.323 Annex E call signaling transport
-call-sig-trans	2517/tcp    # H.323 Annex E call signaling transport
-#			   Gur Kimchi &lt;gur.kimchi@vocaltec.com&gt;
-willy		2518/udp    # Willy
-willy		2518/tcp    # Willy
-#			   Carl-Johan Wik &lt;cjw@hudsmoar.com&gt;
-globmsgsvc	2519/udp    # globmsgsvc
-globmsgsvc	2519/tcp    # globmsgsvc
-#			   David Wiltz &lt;dwiltz@hf.intel.com&gt;	
+jbroker         2506/udp    # jbroker
+jbroker         2506/tcp    # jbroker
+#                          Rohit Garg &lt;rohit@objectScape.com&gt;
+spock           2507/udp    # spock
+spock           2507/tcp    # spock
+#                          Jon A. Christopher &lt;jac8792@tamu.edu&gt;
+jdatastore      2508/udp    # JDataStore
+jdatastore      2508/tcp    # JDataStore
+#                          Tod Landis &lt;tlandis@inprise.com&gt;
+fjmpss          2509/udp    # fjmpss
+fjmpss          2509/tcp    # fjmpss
+#                          Makoto Watanabe &lt;makoto@saint.nm.fujitsu.co.jp&gt;
+fjappmgrbulk    2510/udp    # fjappmgrbulk
+fjappmgrbulk    2510/tcp    # fjappmgrbulk
+#                          Hiroyuki Kawabuchi &lt;buchi@ael.fujitsu.co.jp&gt;
+metastorm       2511/udp    # Metastorm
+metastorm       2511/tcp    # Metastorm
+#                          Eric Isom &lt;eisom@metastorm.com&gt;
+citrixima       2512/udp    # Citrix IMA
+citrixima       2512/tcp    # Citrix IMA
+citrixadmin     2513/udp    # Citrix ADMIN
+citrixadmin     2513/tcp    # Citrix ADMIN
+#                          Myk Willis &lt;myk.willis@citrix.com&gt;
+facsys-ntp      2514/udp    # Facsys NTP
+facsys-ntp      2514/tcp    # Facsys NTP
+facsys-router   2515/udp    # Facsys Router
+facsys-router   2515/tcp    # Facsys Router
+#                          Jeff Hoffman &lt;jeffh@facsys.com&gt;
+maincontrol     2516/udp    # Main Control
+maincontrol     2516/tcp    # Main Control
+#                          Nathan Sadia &lt;sadia@maincontrol.com&gt;
+call-sig-trans  2517/udp    # H.323 Annex E call signaling transport
+call-sig-trans  2517/tcp    # H.323 Annex E call signaling transport
+#                          Gur Kimchi &lt;gur.kimchi@vocaltec.com&gt;
+willy           2518/udp    # Willy
+willy           2518/tcp    # Willy
+#                          Carl-Johan Wik &lt;cjw@hudsmoar.com&gt;
+globmsgsvc      2519/udp    # globmsgsvc
+globmsgsvc      2519/tcp    # globmsgsvc
+#                          David Wiltz &lt;dwiltz@hf.intel.com&gt;
 pvsw            2520/udp    # Pervasive Listener
 pvsw            2520/tcp    # Pervasive Listener
 #                          Chuck Talk &lt;ctalk@pervasive.com&gt;
-adaptecmgr	2521/udp    # Adaptec Manager
-adaptecmgr	2521/tcp    # Adaptec Manager
-#			   Mark Parenti &lt;map@ntc.adaptec.com&gt;
-windb		2522/udp    # WinDb
-windb		2522/tcp    # WinDb
-#			   Larry Traylor &lt;larry@arium.com&gt;
+adaptecmgr      2521/udp    # Adaptec Manager
+adaptecmgr      2521/tcp    # Adaptec Manager
+#                          Mark Parenti &lt;map@ntc.adaptec.com&gt;
+windb           2522/udp    # WinDb
+windb           2522/tcp    # WinDb
+#                          Larry Traylor &lt;larry@arium.com&gt;
 qke-llc-v3      2523/udp    # Qke LLC V.3
 qke-llc-v3      2523/tcp    # Qke LLC V.3
 #                          Joerg Niehoff &lt;joerg.niehoff@alcatel-ke.de&gt;
-optiwave-lm	2524/udp    # Optiwave License Management
-optiwave-lm	2524/tcp    # Optiwave License Management
-#			   Slawomir Krzesinski &lt;slavek@optiwave.com&gt;
-ms-v-worlds	2525/udp    # MS V-Worlds 
-ms-v-worlds	2525/tcp    # MS V-Worlds 
-#			   Pete Wong &lt;petewong@microsoft.com&gt;
-ema-sent-lm	2526/udp    # EMA License Manager
-ema-sent-lm	2526/tcp    # EMA License Manager
-#			   Thaddeus Perala &lt;tr@emaden.com&gt;
-iqserver	2527/udp    # IQ Server
-iqserver	2527/tcp    # IQ Server
-#			   Nick Straguzzi &lt;Nick_Straguzzi@akbs.com&gt;
-ncr_ccl		2528/udp    # NCR CCL
-ncr_ccl		2528/tcp    # NCR CCL
-#			   Amitava Dutta &lt;Amitava.Dutta@WoodbridgeNJ.ncr.com&gt;
-utsftp		2529/udp    # UTS FTP
-utsftp		2529/tcp    # UTS FTP
-#			   David Moore &lt;dmoore@uttc-uts.com&gt;
-vrcommerce	2530/udp    # VR Commerce
-vrcommerce	2530/tcp    # VR Commerce
-#			   Yosi Mass &lt;yosimass@haifa.vnet.ibm.com&gt;
-ito-e-gui	2531/udp    # ITO-E GUI
-ito-e-gui	2531/tcp    # ITO-E GUI
-#			   Michael Haeuptle &lt;Michael_Haeuptle@hp.com&gt;
-ovtopmd		2532/udp    # OVTOPMD
-ovtopmd		2532/tcp    # OVTOPMD
-#			   Eric Pulsipher &lt;eric_pulsipher@hp.com&gt;
-snifferserver	2533/udp    # SnifferServer
-snifferserver	2533/tcp    # SnifferServer
-#			   Amy Weaver &lt;Amy_Weaver@NAI.com&gt;
-combox-web-acc	2534/udp    # Combox Web Access
-combox-web-acc	2534/tcp    # Combox Web Access
-#		   	   Yochai Cohen &lt;yochai@combox.co.il&gt;
-madcap		2535/udp    # MADCAP
-madcap		2535/tcp    # MADCAP
-#			   Stephen Hanna &lt;steve.hanna@sun.com&gt;
+optiwave-lm     2524/udp    # Optiwave License Management
+optiwave-lm     2524/tcp    # Optiwave License Management
+#                          Slawomir Krzesinski &lt;slavek@optiwave.com&gt;
+ms-v-worlds     2525/udp    # MS V-Worlds
+ms-v-worlds     2525/tcp    # MS V-Worlds
+#                          Pete Wong &lt;petewong@microsoft.com&gt;
+ema-sent-lm     2526/udp    # EMA License Manager
+ema-sent-lm     2526/tcp    # EMA License Manager
+#                          Thaddeus Perala &lt;tr@emaden.com&gt;
+iqserver        2527/udp    # IQ Server
+iqserver        2527/tcp    # IQ Server
+#                          Nick Straguzzi &lt;Nick_Straguzzi@akbs.com&gt;
+ncr_ccl         2528/udp    # NCR CCL
+ncr_ccl         2528/tcp    # NCR CCL
+#                          Amitava Dutta &lt;Amitava.Dutta@WoodbridgeNJ.ncr.com&gt;
+utsftp          2529/udp    # UTS FTP
+utsftp          2529/tcp    # UTS FTP
+#                          David Moore &lt;dmoore@uttc-uts.com&gt;
+vrcommerce      2530/udp    # VR Commerce
+vrcommerce      2530/tcp    # VR Commerce
+#                          Yosi Mass &lt;yosimass@haifa.vnet.ibm.com&gt;
+ito-e-gui       2531/udp    # ITO-E GUI
+ito-e-gui       2531/tcp    # ITO-E GUI
+#                          Michael Haeuptle &lt;Michael_Haeuptle@hp.com&gt;
+ovtopmd         2532/udp    # OVTOPMD
+ovtopmd         2532/tcp    # OVTOPMD
+#                          Eric Pulsipher &lt;eric_pulsipher@hp.com&gt;
+snifferserver   2533/udp    # SnifferServer
+snifferserver   2533/tcp    # SnifferServer
+#                          Amy Weaver &lt;Amy_Weaver@NAI.com&gt;
+combox-web-acc  2534/udp    # Combox Web Access
+combox-web-acc  2534/tcp    # Combox Web Access
+#                          Yochai Cohen &lt;yochai@combox.co.il&gt;
+madcap          2535/udp    # MADCAP
+madcap          2535/tcp    # MADCAP
+#                          Stephen Hanna &lt;steve.hanna@sun.com&gt;
 btpp2audctr1    2536/udp    # btpp2audctr1
 btpp2audctr1    2536/tcp    # btpp2audctr1
 #                          Ian Daniels &lt;btexact.ports@bt.com&gt;
-upgrade		2537/udp    # Upgrade Protocol
-upgrade		2537/tcp    # Upgrade Protocol
-#			   Breck Auten &lt;bauten@dst-inc.com&gt;
-vnwk-prapi	2538/udp    # vnwk-prapi
-vnwk-prapi	2538/tcp    # vnwk-prapi
-#			   John Hasselkus &lt;Jhasselkus@VisualNetworks.com&gt;
-vsiadmin	2539/udp    # VSI Admin
-vsiadmin	2539/tcp    # VSI Admin
-#			   Rob Juergens &lt;robj@vsi.com&gt;
-lonworks	2540/udp    # LonWorks
-lonworks	2540/tcp    # LonWorks
-lonworks2	2541/udp    # LonWorks2 
-lonworks2	2541/tcp    # LonWorks2
-#			   Gary Bartlett &lt;garyb@echelon.com&gt;
+upgrade         2537/udp    # Upgrade Protocol
+upgrade         2537/tcp    # Upgrade Protocol
+#                          Breck Auten &lt;bauten@dst-inc.com&gt;
+vnwk-prapi      2538/udp    # vnwk-prapi
+vnwk-prapi      2538/tcp    # vnwk-prapi
+#                          John Hasselkus &lt;Jhasselkus@VisualNetworks.com&gt;
+vsiadmin        2539/udp    # VSI Admin
+vsiadmin        2539/tcp    # VSI Admin
+#                          Rob Juergens &lt;robj@vsi.com&gt;
+lonworks        2540/udp    # LonWorks
+lonworks        2540/tcp    # LonWorks
+lonworks2       2541/udp    # LonWorks2
+lonworks2       2541/tcp    # LonWorks2
+#                          Gary Bartlett &lt;garyb@echelon.com&gt;
 davinci         2542/udp    # daVinci Presenter
 davinci         2542/tcp    # daVinci Presenter
 #                          b-novative GmbH &lt;info@b-novative.com&gt;
-reftek		2543/udp    # REFTEK
-reftek		2543/tcp    # REFTEK
-#			   Robert Banfill &lt;r.banfill@reftek.com&gt;
-novell-zen	2544/udp    # Novell ZEN
-novell-zen	2544/tcp    # Novell ZEN
-#			   Randy Cook &lt;RACOOK@novell.com&gt;
-sis-emt		2545/udp    # sis-emt
-sis-emt		2545/tcp    # sis-emt
-#			   Bill Crawford &lt;Bill.Crawford@securicor.co.uk&gt;
-vytalvaultbrtp	2546/udp    # vytalvaultbrtp
+reftek          2543/udp    # REFTEK
+reftek          2543/tcp    # REFTEK
+#                          Robert Banfill &lt;r.banfill@reftek.com&gt;
+novell-zen      2544/udp    # Novell ZEN
+novell-zen      2544/tcp    # Novell ZEN
+#                          Randy Cook &lt;RACOOK@novell.com&gt;
+sis-emt         2545/udp    # sis-emt
+sis-emt         2545/tcp    # sis-emt
+#                          Bill Crawford &lt;Bill.Crawford@securicor.co.uk&gt;
+vytalvaultbrtp  2546/udp    # vytalvaultbrtp
 vytalvaultbrtp  2546/tcp    # vytalvaultbrtp
-vytalvaultvsmp	2547/udp    # vytalvaultvsmp
-vytalvaultvsmp	2547/tcp    # vytalvaultvsmp
-vytalvaultpipe	2548/udp    # vytalvaultpipe
-vytalvaultpipe	2548/tcp    # vytalvaultpipe
-#			   Tim Boldt &lt;timb@vytalnet.com&gt;
-ipass		2549/udp    # IPASS
-ipass		2549/tcp    # IPASS
-#			   Michael Fischer &lt;otterley@Pass.COM&gt;
-ads		2550/udp    # ADS
-ads		2550/tcp    # ADS
-#			   Michael O'Connor &lt;moconnor@adobe.com&gt;
-isg-uda-server	2551/udp    # ISG UDA Server
-isg-uda-server	2551/tcp    # ISG UDA Server
-#			   Dror Harari &lt;Dror.Harari@isgsoft.com&gt;
-call-logging	2552/udp    # Call Logging
-call-logging	2552/tcp    # Call Logging
-#			   Dean Webb &lt;dean.webb@ascend.com&gt;
-efidiningport	2553/udp    # efidiningport
-efidiningport	2553/tcp    # efidiningport
-#			   Lynn Carter &lt;carterl@execpc.com&gt;
-vcnet-link-v10	2554/udp    # VCnet-Link v10
-vcnet-link-v10	2554/tcp    # VCnet-Link v10
-#			   Csaba Mate &lt;mc36@freemail.c3.hu&gt;
-compaq-wcp	2555/udp    # Compaq WCP
-compaq-wcp	2555/tcp    # Compaq WCP
-#			   Ferruccio Barletta &lt;ferruccio.barletta@compaq.com&gt;
-nicetec-nmsvc	2556/udp    # nicetec-nmsvc
-nicetec-nmsvc	2556/tcp    # nicetec-nmsvc
-nicetec-mgmt	2557/udp    # nicetec-mgmt
-nicetec-mgmt	2557/tcp    # nicetec-mgmt
-#			   Joerg Paulus &lt;tech@nicetec.de&gt;	
-pclemultimedia	2558/udp    # PCLE Multi Media
-pclemultimedia	2558/tcp    # PCLE Multi Media
-#			   Bernd Scharping &lt;bscharping@pinnaclesys.com&gt;
-lstp		2559/udp    # LSTP
-lstp		2559/tcp    # LSTP
-#			   Waiki Wright &lt;waiki@us.ibm.com&gt;
-labrat		2560/udp    # labrat
-labrat		2560/tcp    # labrat
-#			   John Harvey &lt;johnbob@austin.ibm.com&gt;
-mosaixcc	2561/udp    # MosaixCC
-mosaixcc	2561/tcp    # MosaixCC
-#			   Steven Frare &lt;stevefr@mosaix.com&gt;
-delibo		2562/udp    # Delibo
-delibo		2562/tcp    # Delibo
-#			   NovaWiz LTD &lt;Moshe@Novawiz.com&gt;
-cti-redwood	2563/udp    # CTI Redwood
-cti-redwood	2563/tcp    # CTI Redwood
-#			   Songwon Chi &lt;swchi@daou.co.kr&gt;
+vytalvaultvsmp  2547/udp    # vytalvaultvsmp
+vytalvaultvsmp  2547/tcp    # vytalvaultvsmp
+vytalvaultpipe  2548/udp    # vytalvaultpipe
+vytalvaultpipe  2548/tcp    # vytalvaultpipe
+#                          Tim Boldt &lt;timb@vytalnet.com&gt;
+ipass           2549/udp    # IPASS
+ipass           2549/tcp    # IPASS
+#                          Michael Fischer &lt;otterley@Pass.COM&gt;
+ads             2550/udp    # ADS
+ads             2550/tcp    # ADS
+#                          Michael O'Connor &lt;moconnor@adobe.com&gt;
+isg-uda-server  2551/udp    # ISG UDA Server
+isg-uda-server  2551/tcp    # ISG UDA Server
+#                          Dror Harari &lt;Dror.Harari@isgsoft.com&gt;
+call-logging    2552/udp    # Call Logging
+call-logging    2552/tcp    # Call Logging
+#                          Dean Webb &lt;dean.webb@ascend.com&gt;
+efidiningport   2553/udp    # efidiningport
+efidiningport   2553/tcp    # efidiningport
+#                          Lynn Carter &lt;carterl@execpc.com&gt;
+vcnet-link-v10  2554/udp    # VCnet-Link v10
+vcnet-link-v10  2554/tcp    # VCnet-Link v10
+#                          Csaba Mate &lt;mc36@freemail.c3.hu&gt;
+compaq-wcp      2555/udp    # Compaq WCP
+compaq-wcp      2555/tcp    # Compaq WCP
+#                          Ferruccio Barletta &lt;ferruccio.barletta@compaq.com&gt;
+nicetec-nmsvc   2556/udp    # nicetec-nmsvc
+nicetec-nmsvc   2556/tcp    # nicetec-nmsvc
+nicetec-mgmt    2557/udp    # nicetec-mgmt
+nicetec-mgmt    2557/tcp    # nicetec-mgmt
+#                          Joerg Paulus &lt;tech@nicetec.de&gt;
+pclemultimedia  2558/udp    # PCLE Multi Media
+pclemultimedia  2558/tcp    # PCLE Multi Media
+#                          Bernd Scharping &lt;bscharping@pinnaclesys.com&gt;
+lstp            2559/udp    # LSTP
+lstp            2559/tcp    # LSTP
+#                          Waiki Wright &lt;waiki@us.ibm.com&gt;
+labrat          2560/udp    # labrat
+labrat          2560/tcp    # labrat
+#                          John Harvey &lt;johnbob@austin.ibm.com&gt;
+mosaixcc        2561/udp    # MosaixCC
+mosaixcc        2561/tcp    # MosaixCC
+#                          Steven Frare &lt;stevefr@mosaix.com&gt;
+delibo          2562/udp    # Delibo
+delibo          2562/tcp    # Delibo
+#                          NovaWiz LTD &lt;Moshe@Novawiz.com&gt;
+cti-redwood     2563/udp    # CTI Redwood
+cti-redwood     2563/tcp    # CTI Redwood
+#                          Songwon Chi &lt;swchi@daou.co.kr&gt;
 hp-3000-telnet  2564/tcp    # HP 3000 NS/VT block mode telnet
 #
-coord-svr	2565/udp    # Coordinator Server
-coord-svr	2565/tcp    # Coordinator Server
-#			   Richard Steiger &lt;steiger@ensemblesoft.com&gt;
-pcs-pcw		2566/udp    # pcs-pcw
-pcs-pcw		2566/tcp    # pcs-pcw
-#			   W. Jordan Fitzhugh &lt;jfitz@pcare.com&gt;
-clp		2567/udp    # Cisco Line Protocol
-clp		2567/tcp    # Cisco Line Protocol
-#			   Susan Hinrichs &lt;shinrich@cisco.com&gt;
-spamtrap	2568/udp    # SPAM TRAP
-spamtrap	2568/tcp    # SPAM TRAP
-#			   Chuck Bennett &lt;chuck@benatong.com&gt;
-sonuscallsig	2569/udp    # Sonus Call Signal
-sonuscallsig	2569/tcp    # Sonus Call Signal
-#			   Mark Garti &lt;mgarti@sonusnet.com&gt;
-hs-port		2570/udp    # HS Port
-hs-port		2570/tcp    # HS Port
-#			   Uri Doron &lt;uri@il.netect.com&gt;
-cecsvc		2571/udp    # CECSVC
-cecsvc		2571/tcp    # CECSVC
-#			   Roger Pao &lt;rpao@corder-eng.com&gt;
-ibp		2572/udp    # IBP
-ibp		2572/tcp    # IBP
-#			   Jonathan Downes &lt;jonno@activ.net.au&gt;
+coord-svr       2565/udp    # Coordinator Server
+coord-svr       2565/tcp    # Coordinator Server
+#                          Richard Steiger &lt;steiger@ensemblesoft.com&gt;
+pcs-pcw         2566/udp    # pcs-pcw
+pcs-pcw         2566/tcp    # pcs-pcw
+#                          W. Jordan Fitzhugh &lt;jfitz@pcare.com&gt;
+clp             2567/udp    # Cisco Line Protocol
+clp             2567/tcp    # Cisco Line Protocol
+#                          Susan Hinrichs &lt;shinrich@cisco.com&gt;
+spamtrap        2568/udp    # SPAM TRAP
+spamtrap        2568/tcp    # SPAM TRAP
+#                          Chuck Bennett &lt;chuck@benatong.com&gt;
+sonuscallsig    2569/udp    # Sonus Call Signal
+sonuscallsig    2569/tcp    # Sonus Call Signal
+#                          Mark Garti &lt;mgarti@sonusnet.com&gt;
+hs-port         2570/udp    # HS Port
+hs-port         2570/tcp    # HS Port
+#                          Uri Doron &lt;uri@il.netect.com&gt;
+cecsvc          2571/udp    # CECSVC
+cecsvc          2571/tcp    # CECSVC
+#                          Roger Pao &lt;rpao@corder-eng.com&gt;
+ibp             2572/udp    # IBP
+ibp             2572/tcp    # IBP
+#                          Jonathan Downes &lt;jonno@activ.net.au&gt;
 trustestablish  2573/udp    # Trust Establish
 trustestablish  2573/tcp    # Trust Establish
 #                          Yosi Mass &lt;yosimass@haifa.vnet.ibm.com&gt;
@@ -5920,425 +5920,425 @@ tclprodebugger  2576/tcp    # TCL Pro Debugger
 scipticslsrvr   2577/udp    # Scriptics Lsrvr
 scipticslsrvr   2577/tcp    # Scriptics Lsrvr
 #                          Brent Welch &lt;welch@scriptics.com&gt;
-rvs-isdn-dcp	2578/udp    # RVS ISDN DCP
-rvs-isdn-dcp	2578/tcp    # RVS ISDN DCP
-#			   Michael Zirpel &lt;mbz@rvscom.com&gt;	
-mpfoncl		2579/udp    # mpfoncl
-mpfoncl		2579/tcp    # mpfoncl
-#			   Itaru Kimura &lt;kimura@kel.fujitsu.co.jp&gt;
-tributary	2580/udp    # Tributary
-tributary	2580/tcp    # Tributary
-#			   Louis Lu &lt;LouisL@bristol.com&gt;
-argis-te	2581/udp    # ARGIS TE
-argis-te	2581/tcp    # ARGIS TE
-argis-ds	2582/udp    # ARGIS DS
-argis-ds	2582/tcp    # ARGIS DS
-#			   John Legh-Page &lt;john.legh-page@argis.com&gt;
-mon		2583/udp    # MON
-mon		2583/tcp    # MON
-#			   Jim Trocki &lt;trockij@transmeta.com&gt;
-cyaserv		2584/udp    # cyaserv
-cyaserv		2584/tcp    # cyaserv
-#			   Morgan Jones &lt;mwj@cyasolutions.com&gt;
-netx-server	2585/udp    # NETX Server
-netx-server	2585/tcp    # NETX Server
-netx-agent	2586/udp    # NETX Agent
-netx-agent	2586/tcp    # NETX Agent
-#			   Brett Dolecheck &lt;Dolecheck@IPMetrics.com&gt;
-masc		2587/udp    # MASC
-masc		2587/tcp    # MASC
-#			   Pavlin Ivanov Radoslavov 
-#			   &lt;pavlin@catarina.usc.edu&gt; 
-privilege	2588/udp    # Privilege
-privilege	2588/tcp    # Privilege
-#			   Gil Hecht &lt;GilH@aks.com&gt;
-quartus-tcl	2589/udp    # quartus tcl
-quartus-tcl	2589/tcp    # quartus tcl
-#			   Subroto Datta &lt;subrotod@altera.com&gt;
-idotdist	2590/udp    # idotdist
-idotdist	2590/tcp    # idotdist
-#			   Jason Hunter &lt;jthunter@invino.com&gt;
-maytagshuffle	2591/udp    # Maytag Shuffle
-maytagshuffle	2591/tcp    # Maytag Shuffle
-#			   Maytag Corporation &lt;hbuck@maytag.com&gt;
+rvs-isdn-dcp    2578/udp    # RVS ISDN DCP
+rvs-isdn-dcp    2578/tcp    # RVS ISDN DCP
+#                          Michael Zirpel &lt;mbz@rvscom.com&gt;
+mpfoncl         2579/udp    # mpfoncl
+mpfoncl         2579/tcp    # mpfoncl
+#                          Itaru Kimura &lt;kimura@kel.fujitsu.co.jp&gt;
+tributary       2580/udp    # Tributary
+tributary       2580/tcp    # Tributary
+#                          Louis Lu &lt;LouisL@bristol.com&gt;
+argis-te        2581/udp    # ARGIS TE
+argis-te        2581/tcp    # ARGIS TE
+argis-ds        2582/udp    # ARGIS DS
+argis-ds        2582/tcp    # ARGIS DS
+#                          John Legh-Page &lt;john.legh-page@argis.com&gt;
+mon             2583/udp    # MON
+mon             2583/tcp    # MON
+#                          Jim Trocki &lt;trockij@transmeta.com&gt;
+cyaserv         2584/udp    # cyaserv
+cyaserv         2584/tcp    # cyaserv
+#                          Morgan Jones &lt;mwj@cyasolutions.com&gt;
+netx-server     2585/udp    # NETX Server
+netx-server     2585/tcp    # NETX Server
+netx-agent      2586/udp    # NETX Agent
+netx-agent      2586/tcp    # NETX Agent
+#                          Brett Dolecheck &lt;Dolecheck@IPMetrics.com&gt;
+masc            2587/udp    # MASC
+masc            2587/tcp    # MASC
+#                          Pavlin Ivanov Radoslavov
+#                          &lt;pavlin@catarina.usc.edu&gt;
+privilege       2588/udp    # Privilege
+privilege       2588/tcp    # Privilege
+#                          Gil Hecht &lt;GilH@aks.com&gt;
+quartus-tcl     2589/udp    # quartus tcl
+quartus-tcl     2589/tcp    # quartus tcl
+#                          Subroto Datta &lt;subrotod@altera.com&gt;
+idotdist        2590/udp    # idotdist
+idotdist        2590/tcp    # idotdist
+#                          Jason Hunter &lt;jthunter@invino.com&gt;
+maytagshuffle   2591/udp    # Maytag Shuffle
+maytagshuffle   2591/tcp    # Maytag Shuffle
+#                          Maytag Corporation &lt;hbuck@maytag.com&gt;
 netrek          2592/udp    # netrek
 netrek          2592/tcp    # netrek
 #                          Al Guetzlaff &lt;aeg@teamquest.com&gt;
-mns-mail	2593/udp    # MNS Mail Notice Service
-mns-mail	2593/tcp    # MNS Mail Notice Service
-#			   Rumiko Kikuta &lt;kiku@nd.net.fujitsu.co.jp&gt;
-dts		2594/udp    # Data Base Server
-dts		2594/tcp    # Data Base Server
-#			   Andreas Roene &lt;support@home-online.de&gt;
-worldfusion1	2595/udp    # World Fusion 1
-worldfusion1	2595/tcp    # World Fusion 1
-worldfusion2	2596/udp    # World Fusion 2
-worldfusion2	2596/tcp    # World Fusion 2
-#			   World Fusion &lt;net@worldfusion.com&gt;
-homesteadglory	2597/udp    # Homestead Glory
-homesteadglory	2597/tcp    # Homestead Glory
-#			   John Tokash &lt;jtokash@homestead.com&gt;
-citriximaclient	2598/udp    # Citrix MA Client
-citriximaclient	2598/tcp    # Citrix MA Client
-#			   Myk Willis &lt;myk.willis@citrix.com&gt;
+mns-mail        2593/udp    # MNS Mail Notice Service
+mns-mail        2593/tcp    # MNS Mail Notice Service
+#                          Rumiko Kikuta &lt;kiku@nd.net.fujitsu.co.jp&gt;
+dts             2594/udp    # Data Base Server
+dts             2594/tcp    # Data Base Server
+#                          Andreas Roene &lt;support@home-online.de&gt;
+worldfusion1    2595/udp    # World Fusion 1
+worldfusion1    2595/tcp    # World Fusion 1
+worldfusion2    2596/udp    # World Fusion 2
+worldfusion2    2596/tcp    # World Fusion 2
+#                          World Fusion &lt;net@worldfusion.com&gt;
+homesteadglory  2597/udp    # Homestead Glory
+homesteadglory  2597/tcp    # Homestead Glory
+#                          John Tokash &lt;jtokash@homestead.com&gt;
+citriximaclient 2598/udp    # Citrix MA Client
+citriximaclient 2598/tcp    # Citrix MA Client
+#                          Myk Willis &lt;myk.willis@citrix.com&gt;
 snapd           2599/udp    # Snap Discovery
 snapd           2599/tcp    # Snap Discovery
 #                          Kevin Osborn &lt;kosborn@snapappliance.com&gt;
-hpstgmgr	2600/udp    # HPSTGMGR
-hpstgmgr	2600/tcp    # HPSTGMGR
-#			   Kevin Collins &lt;kevinc@.cnd.hp.com&gt;
-discp-client	2601/udp    # discp client
-discp-client	2601/tcp    # discp client
-discp-server	2602/udp    # discp server
-discp-server	2602/tcp    # discp server
-#			   Peter White &lt;peter_white@3com.com&gt;
-servicemeter	2603/udp    # Service Meter
-servicemeter	2603/tcp    # Service Meter
-#			   Duncan Hare &lt;Duncan.Hare@synoia.com&gt;
-nsc-ccs		2604/udp    # NSC CCS	
-nsc-ccs		2604/tcp    # NSC CCS	
-nsc-posa	2605/udp    # NSC POSA
-nsc-posa	2605/tcp    # NSC POSA
-#			   Tom Findley &lt;tom.findley@networksciences.net&gt;
-netmon		2606/udp    # Dell Netmon
-netmon		2606/tcp    # Dell Netmon
-connection	2607/udp    # Dell Connection
-connection	2607/tcp    # Dell Connection
-#			   Sudhir Shetty &lt;Sudhir_Shetty@Dell.com&gt;
-wag-service	2608/udp    # Wag Service
-wag-service	2608/tcp    # Wag Service
-#			   Gilles Bourquard &lt;gbo@wag.ch&gt;
-system-monitor	2609/udp    # System Monitor 
-system-monitor	2609/tcp    # System Monitor 
-#			   Greg Robson-Garth &lt;gregr@alphalink.com.au&gt;
-versa-tek	2610/udp    # VersaTek
-versa-tek	2610/tcp    # VersaTek
-#			   James Kou &lt;Jamesk@versatek.com&gt;
-lionhead	2611/udp    # LIONHEAD
-lionhead	2611/tcp    # LIONHEAD
-#			   Tim Rance &lt;trance@lionhead.co.uk&gt;
-qpasa-agent	2612/udp    # Qpasa Agent
-qpasa-agent	2612/tcp    # Qpasa Agent
-#			   Craig Ching &lt;cching@mqsoftware.com&gt; 
-smntubootstrap	2613/udp    # SMNTUBootstrap
-smntubootstrap	2613/tcp    # SMNTUBootstrap
-#			   Matt Cecile &lt;mattc@metrics.com&gt;
-neveroffline	2614/udp    # Never Offline
-neveroffline	2614/tcp    # Never Offline
-#			   Dustin Brand &lt;amo@amo.net&gt;
+hpstgmgr        2600/udp    # HPSTGMGR
+hpstgmgr        2600/tcp    # HPSTGMGR
+#                          Kevin Collins &lt;kevinc@.cnd.hp.com&gt;
+discp-client    2601/udp    # discp client
+discp-client    2601/tcp    # discp client
+discp-server    2602/udp    # discp server
+discp-server    2602/tcp    # discp server
+#                          Peter White &lt;peter_white@3com.com&gt;
+servicemeter    2603/udp    # Service Meter
+servicemeter    2603/tcp    # Service Meter
+#                          Duncan Hare &lt;Duncan.Hare@synoia.com&gt;
+nsc-ccs         2604/udp    # NSC CCS
+nsc-ccs         2604/tcp    # NSC CCS
+nsc-posa        2605/udp    # NSC POSA
+nsc-posa        2605/tcp    # NSC POSA
+#                          Tom Findley &lt;tom.findley@networksciences.net&gt;
+netmon          2606/udp    # Dell Netmon
+netmon          2606/tcp    # Dell Netmon
+connection      2607/udp    # Dell Connection
+connection      2607/tcp    # Dell Connection
+#                          Sudhir Shetty &lt;Sudhir_Shetty@Dell.com&gt;
+wag-service     2608/udp    # Wag Service
+wag-service     2608/tcp    # Wag Service
+#                          Gilles Bourquard &lt;gbo@wag.ch&gt;
+system-monitor  2609/udp    # System Monitor
+system-monitor  2609/tcp    # System Monitor
+#                          Greg Robson-Garth &lt;gregr@alphalink.com.au&gt;
+versa-tek       2610/udp    # VersaTek
+versa-tek       2610/tcp    # VersaTek
+#                          James Kou &lt;Jamesk@versatek.com&gt;
+lionhead        2611/udp    # LIONHEAD
+lionhead        2611/tcp    # LIONHEAD
+#                          Tim Rance &lt;trance@lionhead.co.uk&gt;
+qpasa-agent     2612/udp    # Qpasa Agent
+qpasa-agent     2612/tcp    # Qpasa Agent
+#                          Craig Ching &lt;cching@mqsoftware.com&gt;
+smntubootstrap  2613/udp    # SMNTUBootstrap
+smntubootstrap  2613/tcp    # SMNTUBootstrap
+#                          Matt Cecile &lt;mattc@metrics.com&gt;
+neveroffline    2614/udp    # Never Offline
+neveroffline    2614/tcp    # Never Offline
+#                          Dustin Brand &lt;amo@amo.net&gt;
 firepower       2615/udp    # firepower
 firepower       2615/tcp    # firepower
 #                          Jason Volk &lt;jason@teknidude.com&gt;
-appswitch-emp	2616/udp    # appswitch-emp
-appswitch-emp	2616/tcp    # appswitch-emp
-#			   Ted Ross &lt;ross@TopLayer.com&gt;
-cmadmin		2617/udp    # Clinical Context Managers
-cmadmin		2617/tcp    # Clinical Context Managers
-#			   Mark Morwood &lt;markm@sentillion.com&gt;  
-priority-e-com	2618/udp    # Priority E-Com
-priority-e-com	2618/tcp    # Priority E-Com
-#			   Marcelo Einhorn &lt;marcelo@eshbel.com&gt;
-bruce		2619/udp    # bruce
-bruce		2619/tcp    # bruce
-#			   Alec Muffett &lt;alecm@sun.com&gt;
-lpsrecommender	2620/udp    # LPSRecommender
-lpsrecommender	2620/tcp    # LPSRecommender
-#			   Pritham Shetty &lt;pritham@andromedia.com&gt;
-miles-apart	2621/udp    # Miles Apart Jukebox Server
-miles-apart	2621/tcp    # Miles Apart Jukebox Server
-#			   Michael Rathmann &lt;rathmann_ia@milesinfo.com&gt;
-metricadbc	2622/udp    # MetricaDBC
-metricadbc	2622/tcp    # MetricaDBC
-#			   Russ Olivant &lt;russ.olivant@metrica.co.uk&gt;
-lmdp		2623/udp    # LMDP
-lmdp		2623/tcp    # LMDP
-#			   Ken Bailey &lt;kbailey@rockettalk.com&gt;
-aria		2624/udp    # Aria
-aria		2624/tcp    # Aria
-#			   Logan Bruns &lt;logan@andromedia.com&gt;
-blwnkl-port	2625/udp    # Blwnkl Port
-blwnkl-port	2625/tcp    # Blwnkl Port
-#			   Weng Chin (Winson) Yung &lt;Winson_Yung@3com.com&gt;
-gbjd816		2626/udp    # gbjd816
-gbjd816		2626/tcp    # gbjd816
-#			   George Balesta &lt;George.Baletsa@tfn.com&gt;
-moshebeeri	2627/udp    # Moshe Beeri
-moshebeeri	2627/tcp    # Moshe Beeri
-#			   Moshe Beeri &lt;moshe@whale-com.com&gt;
-dict		2628/udp    # DICT
-dict		2628/tcp    # DICT
-#			   Rik Faith &lt;faith@cs.unc.edu&gt;
-sitaraserver	2629/udp    # Sitara Server
-sitaraserver	2629/tcp    # Sitara Server
-sitaramgmt	2630/udp    # Sitara Management
-sitaramgmt	2630/tcp    # Sitara Management
-sitaradir	2631/udp    # Sitara Dir
-sitaradir	2631/tcp    # Sitara Dir
-#		  	   Manickam R.Sridhar &lt;msridhar@sitaranetworks.com&gt;
-irdg-post	2632/udp    # IRdg Post
-irdg-post	2632/tcp    # IRdg Post
-#			   IRdg, Inc. &lt;jtaylor@irdg.com&gt;
-interintelli	2633/udp    # InterIntelli
-interintelli	2633/tcp    # InterIntelli
-#			   Mike Gagle &lt;MikeG@inter-intelli.com&gt;
+appswitch-emp   2616/udp    # appswitch-emp
+appswitch-emp   2616/tcp    # appswitch-emp
+#                          Ted Ross &lt;ross@TopLayer.com&gt;
+cmadmin         2617/udp    # Clinical Context Managers
+cmadmin         2617/tcp    # Clinical Context Managers
+#                          Mark Morwood &lt;markm@sentillion.com&gt;
+priority-e-com  2618/udp    # Priority E-Com
+priority-e-com  2618/tcp    # Priority E-Com
+#                          Marcelo Einhorn &lt;marcelo@eshbel.com&gt;
+bruce           2619/udp    # bruce
+bruce           2619/tcp    # bruce
+#                          Alec Muffett &lt;alecm@sun.com&gt;
+lpsrecommender  2620/udp    # LPSRecommender
+lpsrecommender  2620/tcp    # LPSRecommender
+#                          Pritham Shetty &lt;pritham@andromedia.com&gt;
+miles-apart     2621/udp    # Miles Apart Jukebox Server
+miles-apart     2621/tcp    # Miles Apart Jukebox Server
+#                          Michael Rathmann &lt;rathmann_ia@milesinfo.com&gt;
+metricadbc      2622/udp    # MetricaDBC
+metricadbc      2622/tcp    # MetricaDBC
+#                          Russ Olivant &lt;russ.olivant@metrica.co.uk&gt;
+lmdp            2623/udp    # LMDP
+lmdp            2623/tcp    # LMDP
+#                          Ken Bailey &lt;kbailey@rockettalk.com&gt;
+aria            2624/udp    # Aria
+aria            2624/tcp    # Aria
+#                          Logan Bruns &lt;logan@andromedia.com&gt;
+blwnkl-port     2625/udp    # Blwnkl Port
+blwnkl-port     2625/tcp    # Blwnkl Port
+#                          Weng Chin (Winson) Yung &lt;Winson_Yung@3com.com&gt;
+gbjd816         2626/udp    # gbjd816
+gbjd816         2626/tcp    # gbjd816
+#                          George Balesta &lt;George.Baletsa@tfn.com&gt;
+moshebeeri      2627/udp    # Moshe Beeri
+moshebeeri      2627/tcp    # Moshe Beeri
+#                          Moshe Beeri &lt;moshe@whale-com.com&gt;
+dict            2628/udp    # DICT
+dict            2628/tcp    # DICT
+#                          Rik Faith &lt;faith@cs.unc.edu&gt;
+sitaraserver    2629/udp    # Sitara Server
+sitaraserver    2629/tcp    # Sitara Server
+sitaramgmt      2630/udp    # Sitara Management
+sitaramgmt      2630/tcp    # Sitara Management
+sitaradir       2631/udp    # Sitara Dir
+sitaradir       2631/tcp    # Sitara Dir
+#                          Manickam R.Sridhar &lt;msridhar@sitaranetworks.com&gt;
+irdg-post       2632/udp    # IRdg Post
+irdg-post       2632/tcp    # IRdg Post
+#                          IRdg, Inc. &lt;jtaylor@irdg.com&gt;
+interintelli    2633/udp    # InterIntelli
+interintelli    2633/tcp    # InterIntelli
+#                          Mike Gagle &lt;MikeG@inter-intelli.com&gt;
 pk-electronics  2634/udp    # PK Electronics
 pk-electronics  2634/tcp    # PK Electronics
-#			   Seb Ibis &lt;seb_ibis@pkworld.com&gt;
-backburner	2635/udp    # Back Burner
-backburner	2635/tcp    # Back Burner
-#			   Kevin Teiskoetter &lt;kevint@metacreations.com&gt;
-solve		2636/udp    # Solve
-solve		2636/tcp    # Solve
-#			   Peter Morrison &lt;peter_morrison@sydney.sterling.com&gt;
-imdocsvc	2637/udp    # Import Document Service
-imdocsvc	2637/tcp    # Import Document Service
-#			   Zia Bhatti &lt;zia@netright.com&gt;
-sybaseanywhere	2638/udp    # Sybase Anywhere
+#                          Seb Ibis &lt;seb_ibis@pkworld.com&gt;
+backburner      2635/udp    # Back Burner
+backburner      2635/tcp    # Back Burner
+#                          Kevin Teiskoetter &lt;kevint@metacreations.com&gt;
+solve           2636/udp    # Solve
+solve           2636/tcp    # Solve
+#                          Peter Morrison &lt;peter_morrison@sydney.sterling.com&gt;
+imdocsvc        2637/udp    # Import Document Service
+imdocsvc        2637/tcp    # Import Document Service
+#                          Zia Bhatti &lt;zia@netright.com&gt;
+sybaseanywhere  2638/udp    # Sybase Anywhere
 sybaseanywhere  2638/tcp    # Sybase Anywhere
-#			   Dave Neudoerffer &lt;Dave.Neudoerffer@ianywhere.com&gt;
-aminet		2639/udp    # AMInet
-aminet		2639/tcp    # AMInet
-#			   Alcorn McBride Inc. &lt;jeff@alcorn.com&gt;
-sai_sentlm	2640/udp    # Sabbagh Associates Licence Manager
-sai_sentlm	2640/tcp    # Sabbagh Associates Licence Manager
-#			   Elias Sabbagh &lt;ehs@sabbagh.com&gt;
-hdl-srv		2641/udp    # HDL Server
-hdl-srv		2641/tcp    # HDL Server
-#			   David Ely &lt;dely@cnri.reston.va.us&gt;
-tragic		2642/udp    # Tragic
-tragic		2642/tcp    # Tragic
-#			   Stu Mark &lt;fordii@j51.com&gt;
-gte-samp	2643/udp    # GTE-SAMP
-gte-samp	2643/tcp    # GTE-SAMP
-#			   Asher Altman &lt;Asher.Altman@GSC.GTE.Com&gt;
-travsoft-ipx-t	2644/udp    # Travsoft IPX Tunnel
-travsoft-ipx-t	2644/tcp    # Travsoft IPX Tunnel
-#			   Jack Wilson &lt;JackW@travsoft.com&gt;
-novell-ipx-cmd	2645/udp    # Novell IPX CMD
-novell-ipx-cmd	2645/tcp    # Novell IPX CMD
-#			   Juan Carlos Luciani &lt;jluciani@novell.com&gt;
-and-lm		2646/udp    # AND License Manager
-and-lm		2646/tcp    # AND License Manager
-#			   Dick van der Sijs &lt;dick@and.nl&gt;
-syncserver	2647/udp    # SyncServer
-syncserver	2647/tcp    # SyncServer
-#			   Dave Finnegan &lt;dave@syncinc.com&gt;
-upsnotifyprot	2648/udp    # Upsnotifyprot
-upsnotifyprot	2648/tcp    # Upsnotifyprot
-#			   Mario Leboute &lt;leboute@pro.via-rs.com.br&gt;
-vpsipport	2649/udp    # VPSIPPORT
-vpsipport	2649/tcp    # VPSIPPORT
-#			   Joon Radley &lt;jradley@csir.co.za&gt;
+#                          Dave Neudoerffer &lt;Dave.Neudoerffer@ianywhere.com&gt;
+aminet          2639/udp    # AMInet
+aminet          2639/tcp    # AMInet
+#                          Alcorn McBride Inc. &lt;jeff@alcorn.com&gt;
+sai_sentlm      2640/udp    # Sabbagh Associates Licence Manager
+sai_sentlm      2640/tcp    # Sabbagh Associates Licence Manager
+#                          Elias Sabbagh &lt;ehs@sabbagh.com&gt;
+hdl-srv         2641/udp    # HDL Server
+hdl-srv         2641/tcp    # HDL Server
+#                          David Ely &lt;dely@cnri.reston.va.us&gt;
+tragic          2642/udp    # Tragic
+tragic          2642/tcp    # Tragic
+#                          Stu Mark &lt;fordii@j51.com&gt;
+gte-samp        2643/udp    # GTE-SAMP
+gte-samp        2643/tcp    # GTE-SAMP
+#                          Asher Altman &lt;Asher.Altman@GSC.GTE.Com&gt;
+travsoft-ipx-t  2644/udp    # Travsoft IPX Tunnel
+travsoft-ipx-t  2644/tcp    # Travsoft IPX Tunnel
+#                          Jack Wilson &lt;JackW@travsoft.com&gt;
+novell-ipx-cmd  2645/udp    # Novell IPX CMD
+novell-ipx-cmd  2645/tcp    # Novell IPX CMD
+#                          Juan Carlos Luciani &lt;jluciani@novell.com&gt;
+and-lm          2646/udp    # AND License Manager
+and-lm          2646/tcp    # AND License Manager
+#                          Dick van der Sijs &lt;dick@and.nl&gt;
+syncserver      2647/udp    # SyncServer
+syncserver      2647/tcp    # SyncServer
+#                          Dave Finnegan &lt;dave@syncinc.com&gt;
+upsnotifyprot   2648/udp    # Upsnotifyprot
+upsnotifyprot   2648/tcp    # Upsnotifyprot
+#                          Mario Leboute &lt;leboute@pro.via-rs.com.br&gt;
+vpsipport       2649/udp    # VPSIPPORT
+vpsipport       2649/tcp    # VPSIPPORT
+#                          Joon Radley &lt;jradley@csir.co.za&gt;
 eristwoguns     2650/udp    # eristwoguns
 eristwoguns     2650/tcp    # eristwoguns
 #                          NetPro Computing Inc. &lt;ports@netpro.com&gt;
-ebinsite	2651/udp    # EBInSite
-ebinsite	2651/tcp    # EBInSite
-#			   Lefteris Kalamaras &lt;lefteris@ebi.com&gt;
-interpathpanel	2652/udp    # InterPathPanel
-interpathpanel	2652/tcp    # InterPathPanel
-#			   Stephen Misel &lt;steve.misel@interpath.net&gt;
-sonus		2653/udp    # Sonus
-sonus		2653/tcp    # Sonus
-#			   Mark Garti &lt;mgarti@sonusnet.com&gt;
+ebinsite        2651/udp    # EBInSite
+ebinsite        2651/tcp    # EBInSite
+#                          Lefteris Kalamaras &lt;lefteris@ebi.com&gt;
+interpathpanel  2652/udp    # InterPathPanel
+interpathpanel  2652/tcp    # InterPathPanel
+#                          Stephen Misel &lt;steve.misel@interpath.net&gt;
+sonus           2653/udp    # Sonus
+sonus           2653/tcp    # Sonus
+#                          Mark Garti &lt;mgarti@sonusnet.com&gt;
 corel_vncadmin  2654/udp    # Corel VNC Admin
-corel_vncadmin	2654/tcp    # Corel VNC Admin
-#			   Oleg Noskov &lt;olegn@corelcomputer.com&gt;
-unglue		2655/udp    # UNIX Nt Glue
-unglue		2655/tcp    # UNIX Nt Glue
-#			   Peter Santoro &lt;peter@pscomp.com&gt;
-kana		2656/udp    # Kana
-kana		2656/tcp    # Kana
-#			   Colin Goldstein &lt;Colin@kana.com&gt;
-sns-dispatcher	2657/udp    # SNS Dispatcher
-sns-dispatcher	2657/tcp    # SNS Dispatcher
-sns-admin	2658/udp    # SNS Admin
-sns-admin	2658/tcp    # SNS Admin
-sns-query	2659/udp    # SNS Query
-sns-query	2659/tcp    # SNS Query
-#			   Mary Holstege &lt;holstege@firstfloor.com&gt;
-gcmonitor	2660/udp    # GC Monitor
-gcmonitor	2660/tcp    # GC Monitor
-#			   Gustavo Rodriguez-Rivera &lt;grr@geodesic.com&gt;
-olhost		2661/udp    # OLHOST
-olhost		2661/tcp    # OLHOST
-#			   Robert Ripberger &lt;rip@lan-aces.com&gt;
-bintec-capi	2662/udp    # BinTec-CAPI
-bintec-capi	2662/tcp    # BinTec-CAPI
-bintec-tapi	2663/udp    # BinTec-TAPI
-bintec-tapi	2663/tcp    # BinTec-TAPI
+corel_vncadmin  2654/tcp    # Corel VNC Admin
+#                          Oleg Noskov &lt;olegn@corelcomputer.com&gt;
+unglue          2655/udp    # UNIX Nt Glue
+unglue          2655/tcp    # UNIX Nt Glue
+#                          Peter Santoro &lt;peter@pscomp.com&gt;
+kana            2656/udp    # Kana
+kana            2656/tcp    # Kana
+#                          Colin Goldstein &lt;Colin@kana.com&gt;
+sns-dispatcher  2657/udp    # SNS Dispatcher
+sns-dispatcher  2657/tcp    # SNS Dispatcher
+sns-admin       2658/udp    # SNS Admin
+sns-admin       2658/tcp    # SNS Admin
+sns-query       2659/udp    # SNS Query
+sns-query       2659/tcp    # SNS Query
+#                          Mary Holstege &lt;holstege@firstfloor.com&gt;
+gcmonitor       2660/udp    # GC Monitor
+gcmonitor       2660/tcp    # GC Monitor
+#                          Gustavo Rodriguez-Rivera &lt;grr@geodesic.com&gt;
+olhost          2661/udp    # OLHOST
+olhost          2661/tcp    # OLHOST
+#                          Robert Ripberger &lt;rip@lan-aces.com&gt;
+bintec-capi     2662/udp    # BinTec-CAPI
+bintec-capi     2662/tcp    # BinTec-CAPI
+bintec-tapi     2663/udp    # BinTec-TAPI
+bintec-tapi     2663/tcp    # BinTec-TAPI
 #
-patrol-mq-gm	2664/udp    # Patrol for MQ GM
-patrol-mq-gm	2664/tcp    # Patrol for MQ GM
-patrol-mq-nm	2665/udp    # Patrol for MQ NM
-patrol-mq-nm	2665/tcp    # Patrol for MQ NM
-#			   Richard Nikula &lt;richard_nikula@bmc.com&gt;
-extensis	2666/udp    # extensis
-extensis	2666/tcp    # extensis
-#			   Milton Sagen &lt;msagen@extensis.com&gt;	
-alarm-clock-s	2667/udp    # Alarm Clock Server
-alarm-clock-s	2667/tcp    # Alarm Clock Server
-alarm-clock-c	2668/udp    # Alarm Clock Client
-alarm-clock-c	2668/tcp    # Alarm Clock Client
-toad		2669/udp    # TOAD
-toad		2669/tcp    # TOAD
-#			   Michael Marking &lt;marking@tatanka.com&gt;
-tve-announce	2670/udp    # TVE Announce
-tve-announce	2670/tcp    # TVE Announce
-#			   Dean Blackketter &lt;dean@corp.webtv.net&gt;
-newlixreg	2671/udp    # newlixreg
-newlixreg	2671/tcp    # newlixreg
-#			   Jean-Serge Gagnon &lt;jsg@newlix.com&gt;
-nhserver	2672/udp    # nhserver
-nhserver	2672/tcp    # nhserver
-#			   Adrian Hornby &lt;Adrian.Hornby@aran.co.uk&gt;
-firstcall42	2673/udp    # First Call 42 
-firstcall42	2673/tcp    # First Call 42 
-#			   Luke Bowen &lt;leb@tfn.com&gt;
-ewnn		2674/udp    # ewnn
-ewnn		2674/tcp    # ewnn
-#			   Yasunari Yamashita &lt;yamasita@omronsoft.co.jp&gt;
-ttc-etap	2675/udp    # TTC ETAP
-ttc-etap	2675/tcp    # TTC ETAP
-#			   Daniel Becker &lt;becker2d@ttc.com&gt;
-simslink	2676/udp    # SIMSLink
-simslink	2676/tcp    # SIMSLink
-#			   Steve Ryckman &lt;sryckman@simsware.com&gt;
-gadgetgate1way	2677/udp    # Gadget Gate 1 Way
-gadgetgate1way	2677/tcp    # Gadget Gate 1 Way
-gadgetgate2way	2678/udp    # Gadget Gate 2 Way
-gadgetgate2way	2678/tcp    # Gadget Gate 2 Way
-#			   Matt Rollins &lt;matt@internetgadgets.com&gt;
-syncserverssl	2679/udp    # Sync Server SSL
-syncserverssl	2679/tcp    # Sync Server SSL
-#			   Dave Finnegan &lt;dave@syncinc.com&gt;
-pxc-sapxom	2680/udp    # pxc-sapxom
-pxc-sapxom	2680/tcp    # pxc-sapxom
-#			   Hideki Kiriyama &lt;kiriyama@cp10.es.xerox.com&gt;
-mpnjsomb	2681/udp    # mpnjsomb
-mpnjsomb	2681/tcp    # mpnjsomb
-#			   Takenori Miyahara &lt;miyahara@pfu.co.jp&gt;
+patrol-mq-gm    2664/udp    # Patrol for MQ GM
+patrol-mq-gm    2664/tcp    # Patrol for MQ GM
+patrol-mq-nm    2665/udp    # Patrol for MQ NM
+patrol-mq-nm    2665/tcp    # Patrol for MQ NM
+#                          Richard Nikula &lt;richard_nikula@bmc.com&gt;
+extensis        2666/udp    # extensis
+extensis        2666/tcp    # extensis
+#                          Milton Sagen &lt;msagen@extensis.com&gt;
+alarm-clock-s   2667/udp    # Alarm Clock Server
+alarm-clock-s   2667/tcp    # Alarm Clock Server
+alarm-clock-c   2668/udp    # Alarm Clock Client
+alarm-clock-c   2668/tcp    # Alarm Clock Client
+toad            2669/udp    # TOAD
+toad            2669/tcp    # TOAD
+#                          Michael Marking &lt;marking@tatanka.com&gt;
+tve-announce    2670/udp    # TVE Announce
+tve-announce    2670/tcp    # TVE Announce
+#                          Dean Blackketter &lt;dean@corp.webtv.net&gt;
+newlixreg       2671/udp    # newlixreg
+newlixreg       2671/tcp    # newlixreg
+#                          Jean-Serge Gagnon &lt;jsg@newlix.com&gt;
+nhserver        2672/udp    # nhserver
+nhserver        2672/tcp    # nhserver
+#                          Adrian Hornby &lt;Adrian.Hornby@aran.co.uk&gt;
+firstcall42     2673/udp    # First Call 42
+firstcall42     2673/tcp    # First Call 42
+#                          Luke Bowen &lt;leb@tfn.com&gt;
+ewnn            2674/udp    # ewnn
+ewnn            2674/tcp    # ewnn
+#                          Yasunari Yamashita &lt;yamasita@omronsoft.co.jp&gt;
+ttc-etap        2675/udp    # TTC ETAP
+ttc-etap        2675/tcp    # TTC ETAP
+#                          Daniel Becker &lt;becker2d@ttc.com&gt;
+simslink        2676/udp    # SIMSLink
+simslink        2676/tcp    # SIMSLink
+#                          Steve Ryckman &lt;sryckman@simsware.com&gt;
+gadgetgate1way  2677/udp    # Gadget Gate 1 Way
+gadgetgate1way  2677/tcp    # Gadget Gate 1 Way
+gadgetgate2way  2678/udp    # Gadget Gate 2 Way
+gadgetgate2way  2678/tcp    # Gadget Gate 2 Way
+#                          Matt Rollins &lt;matt@internetgadgets.com&gt;
+syncserverssl   2679/udp    # Sync Server SSL
+syncserverssl   2679/tcp    # Sync Server SSL
+#                          Dave Finnegan &lt;dave@syncinc.com&gt;
+pxc-sapxom      2680/udp    # pxc-sapxom
+pxc-sapxom      2680/tcp    # pxc-sapxom
+#                          Hideki Kiriyama &lt;kiriyama@cp10.es.xerox.com&gt;
+mpnjsomb        2681/udp    # mpnjsomb
+mpnjsomb        2681/tcp    # mpnjsomb
+#                          Takenori Miyahara &lt;miyahara@pfu.co.jp&gt;
 #               2682   Removed (2002-04-30)
-ncdloadbalance	2683/udp    # NCDLoadBalance 
-ncdloadbalance	2683/tcp    # NCDLoadBalance 
-#			   Tim Stevenson &lt;tes@ncd.com&gt;
-mpnjsosv	2684/udp    # mpnjsosv
-mpnjsosv	2684/tcp    # mpnjsosv
-mpnjsocl	2685/udp    # mpnjsocl
-mpnjsocl	2685/tcp    # mpnjsocl
-mpnjsomg	2686/udp    # mpnjsomg
-mpnjsomg	2686/tcp    # mpnjsomg
-#			   Takenori Miyahara &lt;miyahara@pfu.co.jp&gt;
-pq-lic-mgmt	2687/udp    # pq-lic-mgmt
-pq-lic-mgmt	2687/tcp    # pq-lic-mgmt
-#			   Bob Sledge &lt;bob@pqsystems.com&gt;
-md-cg-http	2688/udp    # md-cf-http
-md-cg-http	2688/tcp    # md-cf-http
-#			   Lyndon Nerenberg &lt;lyndon@execmail.ca&gt;
-fastlynx	2689/udp    # FastLynx
-fastlynx	2689/tcp    # FastLynx
-#			   Dave Sewell &lt;dave@sewelld.com&gt;
-hp-nnm-data	2690/udp    # HP NNM Embedded Database
-hp-nnm-data	2690/tcp    # HP NNM Embedded Database
-#			   Chris Das &lt;cdas@cnd.hp.com&gt;
-itinternet	2691/udp    # ITInternet ISM Server
-itinternet	2691/tcp    # ITInternet ISM Server
-#			   Ron Ehli &lt;ron@itinternet.net&gt;
-admins-lms	2692/udp    # Admins LMS
-admins-lms	2692/tcp    # Admins LMS
-#			   Dagfinn Saether &lt;Dagfinn@admins.com&gt;
-belarc-http	2693/udp    # belarc-http
-belarc-http	2693/tcp    # belarc-http
-#			   Gary Newman &lt;gnewman@belarc.com&gt;
-pwrsevent	2694/udp    # pwrsevent	
-pwrsevent	2694/tcp    # pwrsevent	
-#			   Yoshinobu Nakamura
-#			   &lt;nakamura@np.lps.cs.fujitsu.co.jp&gt;
-vspread		2695/udp    # VSPREAD
-vspread		2695/tcp    # VSPREAD
-#			   Sumitake kobayashi
-#			   &lt;kobayashi@np.lps.cs.fujitsu.co.jp&gt;
+ncdloadbalance  2683/udp    # NCDLoadBalance
+ncdloadbalance  2683/tcp    # NCDLoadBalance
+#                          Tim Stevenson &lt;tes@ncd.com&gt;
+mpnjsosv        2684/udp    # mpnjsosv
+mpnjsosv        2684/tcp    # mpnjsosv
+mpnjsocl        2685/udp    # mpnjsocl
+mpnjsocl        2685/tcp    # mpnjsocl
+mpnjsomg        2686/udp    # mpnjsomg
+mpnjsomg        2686/tcp    # mpnjsomg
+#                          Takenori Miyahara &lt;miyahara@pfu.co.jp&gt;
+pq-lic-mgmt     2687/udp    # pq-lic-mgmt
+pq-lic-mgmt     2687/tcp    # pq-lic-mgmt
+#                          Bob Sledge &lt;bob@pqsystems.com&gt;
+md-cg-http      2688/udp    # md-cf-http
+md-cg-http      2688/tcp    # md-cf-http
+#                          Lyndon Nerenberg &lt;lyndon@execmail.ca&gt;
+fastlynx        2689/udp    # FastLynx
+fastlynx        2689/tcp    # FastLynx
+#                          Dave Sewell &lt;dave@sewelld.com&gt;
+hp-nnm-data     2690/udp    # HP NNM Embedded Database
+hp-nnm-data     2690/tcp    # HP NNM Embedded Database
+#                          Chris Das &lt;cdas@cnd.hp.com&gt;
+itinternet      2691/udp    # ITInternet ISM Server
+itinternet      2691/tcp    # ITInternet ISM Server
+#                          Ron Ehli &lt;ron@itinternet.net&gt;
+admins-lms      2692/udp    # Admins LMS
+admins-lms      2692/tcp    # Admins LMS
+#                          Dagfinn Saether &lt;Dagfinn@admins.com&gt;
+belarc-http     2693/udp    # belarc-http
+belarc-http     2693/tcp    # belarc-http
+#                          Gary Newman &lt;gnewman@belarc.com&gt;
+pwrsevent       2694/udp    # pwrsevent
+pwrsevent       2694/tcp    # pwrsevent
+#                          Yoshinobu Nakamura
+#                          &lt;nakamura@np.lps.cs.fujitsu.co.jp&gt;
+vspread         2695/udp    # VSPREAD
+vspread         2695/tcp    # VSPREAD
+#                          Sumitake kobayashi
+#                          &lt;kobayashi@np.lps.cs.fujitsu.co.jp&gt;
 unifyadmin      2696/udp    # Unify Admin
 unifyadmin      2696/tcp    # Unify Admin
 #                          Duane Gibson &lt;ianaportmaster@unify.com&gt;
 oce-snmp-trap   2697/udp    # Oce SNMP Trap Port 
 oce-snmp-trap   2697/tcp    # Oce SNMP Trap Port 
 #                          Peter Teeuwen &lt;ptee@oce.nl&gt;
-mck-ivpip	2698/udp    # MCK-IVPIP
-mck-ivpip	2698/tcp    # MCK-IVPIP
-#			   Robert Vincent &lt;bert@mck.com&gt;
-csoft-plusclnt	2699/udp    # Csoft Plus Client
-csoft-plusclnt	2699/tcp    # Csoft Plus Client
-#			   Nedelcho Stanev &lt;nstanev@csoft.bg&gt;
+mck-ivpip       2698/udp    # MCK-IVPIP
+mck-ivpip       2698/tcp    # MCK-IVPIP
+#                          Robert Vincent &lt;bert@mck.com&gt;
+csoft-plusclnt  2699/udp    # Csoft Plus Client
+csoft-plusclnt  2699/tcp    # Csoft Plus Client
+#                          Nedelcho Stanev &lt;nstanev@csoft.bg&gt;
 tqdata          2700/udp    # tqdata
 tqdata          2700/tcp    # tqdata
 #                          Al Guetzlaff &lt;aeg@teamquest.com&gt;
-sms-rcinfo	2701/udp    # SMS RCINFO
-sms-rcinfo	2701/tcp    # SMS RCINFO
-sms-xfer	2702/udp    # SMS XFER
-sms-xfer	2702/tcp    # SMS XFER
-sms-chat	2703/udp    # SMS CHAT
-sms-chat	2703/tcp    # SMS CHAT
-sms-remctrl	2704/udp    # SMS REMCTRL
-sms-remctrl	2704/tcp    # SMS REMCTRL
-#			   Tom Friend &lt;tomfr@microsoft.com&gt;
-sds-admin	2705/udp    # SDS Admin
-sds-admin	2705/tcp    # SDS Admin
-#			   Don Traub &lt;don.traub@sun.com&gt;
-ncdmirroring	2706/udp    # NCD Mirroring
-ncdmirroring	2706/tcp    # NCD Mirroring
-#			   Tim Stevenson &lt;tes@ncd.com&gt;
-emcsymapiport	2707/udp    # EMCSYMAPIPORT
-emcsymapiport	2707/tcp    # EMCSYMAPIPORT
-#			   Bruce Ferjulian &lt;ferjulian_bruce@emc.com&gt;
-banyan-net	2708/udp    # Banyan-Net
-banyan-net	2708/tcp    # Banyan-Net
-#			   R. Thirumurthy &lt;rtm@banyannetworks.com&gt;
-supermon	2709/udp    # Supermon
-supermon	2709/tcp    # Supermon
-#			   Ron Minnich &lt;rminnich@acl.lanl.gov&gt;
-sso-service	2710/udp    # SSO Service
-sso-service	2710/tcp    # SSO Service
-sso-control	2711/udp    # SSO Control
-sso-control	2711/tcp    # SSO Control
-#			   Martin Proulx &lt;mproulx@okiok.com&gt;
-aocp		2712/udp    # Axapta Object Communication Protocol
-aocp		2712/tcp    # Axapta Object Communication Protocol
-#			   Jakob Steen Hansen &lt;jsh@dk.damgaard.com&gt;
-raven1		2713/udp    # Raven1
-raven1		2713/tcp    # Raven1
-raven2		2714/udp    # Raven2
-raven2		2714/tcp    # Raven2
-#			   Daniel Sorlov &lt;Daniel@sorlov.com&gt;
-hpstgmgr2	2715/udp    # HPSTGMGR2
-hpstgmgr2	2715/tcp    # HPSTGMGR2
-#			   Kevin Collins &lt;kevinc@cnd.hp.com&gt;
-inova-ip-disco	2716/udp    # Inova IP Disco
-inova-ip-disco	2716/tcp    # Inova IP Disco
-#			   Chris Koeritz &lt;ckoeritz@inovacorp.com&gt;
-pn-requester	2717/udp    # PN REQUESTER
-pn-requester	2717/tcp    # PN REQUESTER
-pn-requester2	2718/udp    # PN REQUESTER 2
-pn-requester2	2718/tcp    # PN REQUESTER 2
-#			   Edmund Chang &lt;Edmund_Chang@bmc.com&gt;
-scan-change	2719/udp    # Scan &amp; Change
-scan-change	2719/tcp    # Scan &amp; Change
-#			   Alexander Raji &lt;araji@lucent.com&gt;
-wkars		2720/udp    # wkars
-wkars		2720/tcp    # wkars
-#			   Barry Shelton &lt;bshelton@wirelessknowledge.com&gt;
-smart-diagnose	2721/udp    # Smart Diagnose
-smart-diagnose	2721/tcp    # Smart Diagnose
-#			   Geoffry Meek &lt;geoff@meek.com&gt;
-proactivesrvr	2722/udp    # Proactive Server
-proactivesrvr	2722/tcp    # Proactive Server
-#			   Dalit Naor &lt;dalit@il.ibm.com&gt;
-watchdognt	2723/udp    # WatchDog NT
-watchdognt	2723/tcp    # WatchDog NT
-#			   Glen Sansoucie &lt;glens@llmwin.com&gt;
-qotps		2724/udp    # qotps
-qotps		2724/tcp    # qotps
-#			   Piotr Parlewicz &lt;pparlewicz@queryobject.com&gt;
+sms-rcinfo      2701/udp    # SMS RCINFO
+sms-rcinfo      2701/tcp    # SMS RCINFO
+sms-xfer        2702/udp    # SMS XFER
+sms-xfer        2702/tcp    # SMS XFER
+sms-chat        2703/udp    # SMS CHAT
+sms-chat        2703/tcp    # SMS CHAT
+sms-remctrl     2704/udp    # SMS REMCTRL
+sms-remctrl     2704/tcp    # SMS REMCTRL
+#                          Tom Friend &lt;tomfr@microsoft.com&gt;
+sds-admin       2705/udp    # SDS Admin
+sds-admin       2705/tcp    # SDS Admin
+#                          Don Traub &lt;don.traub@sun.com&gt;
+ncdmirroring    2706/udp    # NCD Mirroring
+ncdmirroring    2706/tcp    # NCD Mirroring
+#                          Tim Stevenson &lt;tes@ncd.com&gt;
+emcsymapiport   2707/udp    # EMCSYMAPIPORT
+emcsymapiport   2707/tcp    # EMCSYMAPIPORT
+#                          Bruce Ferjulian &lt;ferjulian_bruce@emc.com&gt;
+banyan-net      2708/udp    # Banyan-Net
+banyan-net      2708/tcp    # Banyan-Net
+#                          R. Thirumurthy &lt;rtm@banyannetworks.com&gt;
+supermon        2709/udp    # Supermon
+supermon        2709/tcp    # Supermon
+#                          Ron Minnich &lt;rminnich@acl.lanl.gov&gt;
+sso-service     2710/udp    # SSO Service
+sso-service     2710/tcp    # SSO Service
+sso-control     2711/udp    # SSO Control
+sso-control     2711/tcp    # SSO Control
+#                          Martin Proulx &lt;mproulx@okiok.com&gt;
+aocp            2712/udp    # Axapta Object Communication Protocol
+aocp            2712/tcp    # Axapta Object Communication Protocol
+#                          Jakob Steen Hansen &lt;jsh@dk.damgaard.com&gt;
+raven1          2713/udp    # Raven1
+raven1          2713/tcp    # Raven1
+raven2          2714/udp    # Raven2
+raven2          2714/tcp    # Raven2
+#                          Daniel Sorlov &lt;Daniel@sorlov.com&gt;
+hpstgmgr2       2715/udp    # HPSTGMGR2
+hpstgmgr2       2715/tcp    # HPSTGMGR2
+#                          Kevin Collins &lt;kevinc@cnd.hp.com&gt;
+inova-ip-disco  2716/udp    # Inova IP Disco
+inova-ip-disco  2716/tcp    # Inova IP Disco
+#                          Chris Koeritz &lt;ckoeritz@inovacorp.com&gt;
+pn-requester    2717/udp    # PN REQUESTER
+pn-requester    2717/tcp    # PN REQUESTER
+pn-requester2   2718/udp    # PN REQUESTER 2
+pn-requester2   2718/tcp    # PN REQUESTER 2
+#                          Edmund Chang &lt;Edmund_Chang@bmc.com&gt;
+scan-change     2719/udp    # Scan &amp; Change
+scan-change     2719/tcp    # Scan &amp; Change
+#                          Alexander Raji &lt;araji@lucent.com&gt;
+wkars           2720/udp    # wkars
+wkars           2720/tcp    # wkars
+#                          Barry Shelton &lt;bshelton@wirelessknowledge.com&gt;
+smart-diagnose  2721/udp    # Smart Diagnose
+smart-diagnose  2721/tcp    # Smart Diagnose
+#                          Geoffry Meek &lt;geoff@meek.com&gt;
+proactivesrvr   2722/udp    # Proactive Server
+proactivesrvr   2722/tcp    # Proactive Server
+#                          Dalit Naor &lt;dalit@il.ibm.com&gt;
+watchdognt      2723/udp    # WatchDog NT
+watchdognt      2723/tcp    # WatchDog NT
+#                          Glen Sansoucie &lt;glens@llmwin.com&gt;
+qotps           2724/udp    # qotps
+qotps           2724/tcp    # qotps
+#                          Piotr Parlewicz &lt;pparlewicz@queryobject.com&gt;
 msolap-ptp2     2725/udp    # MSOLAP PTP2
 msolap-ptp2     2725/tcp    # MSOLAP PTP2
 #                          Cristian Petculescu &lt;cristp@microsoft.com&gt;
@@ -6348,165 +6348,165 @@ tams            2726/tcp    # TAMS
 mgcp-callagent  2727/udp    # Media Gateway Control Protocol Call Agent
 mgcp-callagent  2727/tcp    # Media Gateway Control Protocol Call Agent
 #                          Christian Huitema &lt;huitema@research.telcordia.com&gt;
-sqdr		2728/udp    # SQDR
-sqdr		2728/tcp    # SQDR
-#			   Matthew Orzen &lt;standards@starquest.com&gt;
-tcim-control	2729/udp    # TCIM Control
-tcim-control	2729/tcp    # TCIM Control
-#			   Dean Skelton &lt;mdskel@ftw.rsc.raytheon.com&gt;
-nec-raidplus	2730/udp    # NEC RaidPlus
-nec-raidplus	2730/tcp    # NEC RaidPlus
-#			   Yusuke Asai &lt;yasai@nw1.file.fc.nec.co.jp&gt;
-fyre-messanger	2731/udp    # Fyre Messagner
-fyre-messanger	2731/tcp    # Fyre Messanger
-#			   Robert Waters &lt;bobtek@hotmail.com&gt;
-g5m		2732/udp    # G5M
-g5m		2732/tcp    # G5M
-#			   Graham Klyne &lt;GK@ACM.ORG&gt;
-signet-ctf	2733/udp    # Signet CTF
-signet-ctf	2733/tcp    # Signet CTF
-#			   Greg Broiles &lt;greg@sac.net&gt;
-ccs-software	2734/udp    # CCS Software 
-ccs-software	2734/tcp    # CCS Software 
-#			   Bertus Jacobs &lt;bertus@ccs-software.co.za&gt;
+sqdr            2728/udp    # SQDR
+sqdr            2728/tcp    # SQDR
+#                          Matthew Orzen &lt;standards@starquest.com&gt;
+tcim-control    2729/udp    # TCIM Control
+tcim-control    2729/tcp    # TCIM Control
+#                          Dean Skelton &lt;mdskel@ftw.rsc.raytheon.com&gt;
+nec-raidplus    2730/udp    # NEC RaidPlus
+nec-raidplus    2730/tcp    # NEC RaidPlus
+#                          Yusuke Asai &lt;yasai@nw1.file.fc.nec.co.jp&gt;
+fyre-messanger  2731/udp    # Fyre Messagner
+fyre-messanger  2731/tcp    # Fyre Messanger
+#                          Robert Waters &lt;bobtek@hotmail.com&gt;
+g5m             2732/udp    # G5M
+g5m             2732/tcp    # G5M
+#                          Graham Klyne &lt;GK@ACM.ORG&gt;
+signet-ctf      2733/udp    # Signet CTF
+signet-ctf      2733/tcp    # Signet CTF
+#                          Greg Broiles &lt;greg@sac.net&gt;
+ccs-software    2734/udp    # CCS Software
+ccs-software    2734/tcp    # CCS Software
+#                          Bertus Jacobs &lt;bertus@ccs-software.co.za&gt;
 netiq-mc        2735/udp    # NetIQ Monitor Console
 netiq-mc        2735/tcp    # NetIQ Monitor Console
-#			   Scott Southard &lt;scott.southard@netiq.com&gt;
-radwiz-nms-srv	2736/udp    # RADWIZ NMS SRV
-radwiz-nms-srv	2736/tcp    # RADWIZ NMS SRV
-#			   Israel Shainert &lt;israels@209.88.177.2&gt;
-srp-feedback	2737/udp    # SRP Feedback
-srp-feedback	2737/tcp    # SRP Feedback
-#			   Werner Almesberger &lt;Werner.Almesberger@epfl.ch&gt;
-ndl-tcp-ois-gw	2738/udp    # NDL TCP-OSI Gateway
-ndl-tcp-ois-gw	2738/tcp    # NDL TCP-OSI Gateway
-#			   Martin Norman &lt;martin@ndl.co.uk&gt; 
-tn-timing	2739/udp    # TN Timing
-tn-timing	2739/tcp    # TN Timing
-#			   Paul Roberts &lt;PaulRoberts@engineer.com&gt;
-alarm		2740/udp    # Alarm
-alarm		2740/tcp    # Alarm
-#			   Uriy Makasjuk &lt;racer@bfpg.ru&gt;
-tsb		2741/udp    # TSB
-tsb		2741/tcp    # TSB
-tsb2		2742/udp    # TSB2
-tsb2		2742/tcp    # TSB2
-#			   Ashish Chatterjee
-#			   &lt;achatterjee@freeway.proxy.lucent.com&gt;
-murx		2743/udp    # murx
-murx		2743/tcp    # murx
-#			   Thomas Kuiper &lt;engerim@dachbu.de&gt;
-honyaku		2744/udp    # honyaku
-honyaku		2744/tcp    # honyaku
-#			   Yasunari Yamashita &lt;yamasita@omronsoft.co.jp&gt;
-urbisnet	2745/udp    # URBISNET
-urbisnet	2745/tcp    # URBISNET
-#			   Urbis.Net Ltd &lt;postmaster@urbis.net&gt;
-cpudpencap	2746/udp    # CPUDPENCAP
-cpudpencap	2746/tcp    # CPUDPENCAP
-#			   Tamir Zegman &lt;zegman@checkpoint.com&gt;
-fjippol-swrly	2747/udp # 
-fjippol-swrly	2747/tcp # 
-fjippol-polsvr	2748/udp # 
-fjippol-polsvr	2748/tcp # 
-fjippol-cnsl	2749/udp # 
-fjippol-cnsl	2749/tcp # 
-fjippol-port1	2750/udp # 
-fjippol-port1	2750/tcp # 
-fjippol-port2	2751/udp # 
-fjippol-port2	2751/tcp # 
-#			   Shoichi Tachibana &lt;tatibana@yk.fujitsu.co.jp&gt;
-rsisysaccess	2752/udp    # RSISYS ACCESS
-rsisysaccess	2752/tcp    # RSISYS ACCESS
-#			   Christophe Besant
-de-spot		2753/udp    # de-spot
-de-spot		2753/tcp    # de-spot
-#			   Sanjay Parekh &lt;spot@digitalenvoy.net&gt;
-apollo-cc	2754/udp    # APOLLO CC
-apollo-cc	2754/tcp    # APOLLO CC
-#			   Brand Communications &lt;donovan@brandcomms.com&gt;
-expresspay	2755/udp    # Express Pay
-expresspay	2755/tcp    # Express Pay
-#			   Ben Higgins &lt;bhiggins@netcom.ca&gt;
-simplement-tie	2756/udp    # simplement-tie
-simplement-tie	2756/tcp    # simplement-tie
-#			   Tzvika Chumash &lt;tzvikac@netvision.net.il&gt;
-cnrp		2757/udp    # CNRP
-cnrp		2757/tcp    # CNRP
-#			   Jacob Ulmert &lt;Jacob.Ulmert@se.abb.com&gt;
-apollo-status	2758/udp    # APOLLO Status
-apollo-status	2758/tcp    # APOLLO Status
-apollo-gms	2759/udp    # APOLLO GMS
-apollo-gms	2759/tcp    # APOLLO GMS
-#			   Simon Hovell &lt;simonh@brandcomms.com&gt;
-sabams		2760/udp    # Saba MS
-sabams		2760/tcp    # Saba MS
-#			   Davoud Maha &lt;dmaha@saba.com&gt;
-dicom-iscl	2761/udp    # DICOM ISCL
-dicom-iscl	2761/tcp    # DICOM ISCL
-dicom-tls	2762/udp    # DICOM TLS
-dicom-tls	2762/tcp    # DICOM TLS
-#			   Lawrence Tarbox &lt;ltarbox@scr.siemens.com&gt;
-desktop-dna	2763/udp    # Desktop DNA
-desktop-dna	2763/tcp    # Desktop DNA
-#			   Jon Walker &lt;jwalker@miramarsys.com&gt;
-data-insurance	2764/udp    # Data Insurance
-data-insurance	2764/tcp    # Data Insurance
-#			   Brent Irwin &lt;birwin@standard.com&gt;
-qip-audup	2765/udp    # qip-audup
-qip-audup	2765/tcp    # qip-audup
-#			   Mike Morgan &lt;mmorgan@lucent.com&gt;
-compaq-scp	2766/udp    # Compaq SCP
-compaq-scp	2766/tcp    # Compaq SCP
-#			   Ferruccio Barletta &lt;ferruccio.barletta@compaq.com&gt;
-uadtc		2767/udp    # UADTC
-uadtc		2767/tcp    # UADTC
-uacs		2768/udp    # UACS
-uacs		2768/tcp    # UACS
-#			   Vishwas Lele &lt;Vishwas_Lele@appliedis.com&gt;
-singlept-mvs	2769/udp    # Single Point MVS
-singlept-mvs	2769/tcp    # Single Point MVS
-#			   Thomas Anderson &lt;anderson@clark.net&gt;
-veronica	2770/udp    # Veronica
-veronica	2770/tcp    # Veronica
-#			   Jonas Oberg &lt;jonas@coyote.org&gt;
-vergencecm	2771/udp    # Vergence CM
-vergencecm	2771/tcp    # Vergence CM
-#			   Mark Morwood &lt;markm@sentillion.com&gt;
-auris		2772/udp    # auris
-auris		2772/tcp    # auris
-#			   Francisco Saez Arance &lt;fsaez@tid.es&gt;
+#                          Scott Southard &lt;scott.southard@netiq.com&gt;
+radwiz-nms-srv  2736/udp    # RADWIZ NMS SRV
+radwiz-nms-srv  2736/tcp    # RADWIZ NMS SRV
+#                          Israel Shainert &lt;israels@209.88.177.2&gt;
+srp-feedback    2737/udp    # SRP Feedback
+srp-feedback    2737/tcp    # SRP Feedback
+#                          Werner Almesberger &lt;Werner.Almesberger@epfl.ch&gt;
+ndl-tcp-ois-gw  2738/udp    # NDL TCP-OSI Gateway
+ndl-tcp-ois-gw  2738/tcp    # NDL TCP-OSI Gateway
+#                          Martin Norman &lt;martin@ndl.co.uk&gt;
+tn-timing       2739/udp    # TN Timing
+tn-timing       2739/tcp    # TN Timing
+#                          Paul Roberts &lt;PaulRoberts@engineer.com&gt;
+alarm           2740/udp    # Alarm
+alarm           2740/tcp    # Alarm
+#                          Uriy Makasjuk &lt;racer@bfpg.ru&gt;
+tsb             2741/udp    # TSB
+tsb             2741/tcp    # TSB
+tsb2            2742/udp    # TSB2
+tsb2            2742/tcp    # TSB2
+#                          Ashish Chatterjee
+#                          &lt;achatterjee@freeway.proxy.lucent.com&gt;
+murx            2743/udp    # murx
+murx            2743/tcp    # murx
+#                          Thomas Kuiper &lt;engerim@dachbu.de&gt;
+honyaku         2744/udp    # honyaku
+honyaku         2744/tcp    # honyaku
+#                          Yasunari Yamashita &lt;yamasita@omronsoft.co.jp&gt;
+urbisnet        2745/udp    # URBISNET
+urbisnet        2745/tcp    # URBISNET
+#                          Urbis.Net Ltd &lt;postmaster@urbis.net&gt;
+cpudpencap      2746/udp    # CPUDPENCAP
+cpudpencap      2746/tcp    # CPUDPENCAP
+#                          Tamir Zegman &lt;zegman@checkpoint.com&gt;
+fjippol-swrly   2747/udp #
+fjippol-swrly   2747/tcp #
+fjippol-polsvr  2748/udp #
+fjippol-polsvr  2748/tcp #
+fjippol-cnsl    2749/udp #
+fjippol-cnsl    2749/tcp #
+fjippol-port1   2750/udp #
+fjippol-port1   2750/tcp #
+fjippol-port2   2751/udp #
+fjippol-port2   2751/tcp #
+#                          Shoichi Tachibana &lt;tatibana@yk.fujitsu.co.jp&gt;
+rsisysaccess    2752/udp    # RSISYS ACCESS
+rsisysaccess    2752/tcp    # RSISYS ACCESS
+#                          Christophe Besant
+de-spot         2753/udp    # de-spot
+de-spot         2753/tcp    # de-spot
+#                          Sanjay Parekh &lt;spot@digitalenvoy.net&gt;
+apollo-cc       2754/udp    # APOLLO CC
+apollo-cc       2754/tcp    # APOLLO CC
+#                          Brand Communications &lt;donovan@brandcomms.com&gt;
+expresspay      2755/udp    # Express Pay
+expresspay      2755/tcp    # Express Pay
+#                          Ben Higgins &lt;bhiggins@netcom.ca&gt;
+simplement-tie  2756/udp    # simplement-tie
+simplement-tie  2756/tcp    # simplement-tie
+#                          Tzvika Chumash &lt;tzvikac@netvision.net.il&gt;
+cnrp            2757/udp    # CNRP
+cnrp            2757/tcp    # CNRP
+#                          Jacob Ulmert &lt;Jacob.Ulmert@se.abb.com&gt;
+apollo-status   2758/udp    # APOLLO Status
+apollo-status   2758/tcp    # APOLLO Status
+apollo-gms      2759/udp    # APOLLO GMS
+apollo-gms      2759/tcp    # APOLLO GMS
+#                          Simon Hovell &lt;simonh@brandcomms.com&gt;
+sabams          2760/udp    # Saba MS
+sabams          2760/tcp    # Saba MS
+#                          Davoud Maha &lt;dmaha@saba.com&gt;
+dicom-iscl      2761/udp    # DICOM ISCL
+dicom-iscl      2761/tcp    # DICOM ISCL
+dicom-tls       2762/udp    # DICOM TLS
+dicom-tls       2762/tcp    # DICOM TLS
+#                          Lawrence Tarbox &lt;ltarbox@scr.siemens.com&gt;
+desktop-dna     2763/udp    # Desktop DNA
+desktop-dna     2763/tcp    # Desktop DNA
+#                          Jon Walker &lt;jwalker@miramarsys.com&gt;
+data-insurance  2764/udp    # Data Insurance
+data-insurance  2764/tcp    # Data Insurance
+#                          Brent Irwin &lt;birwin@standard.com&gt;
+qip-audup       2765/udp    # qip-audup
+qip-audup       2765/tcp    # qip-audup
+#                          Mike Morgan &lt;mmorgan@lucent.com&gt;
+compaq-scp      2766/udp    # Compaq SCP
+compaq-scp      2766/tcp    # Compaq SCP
+#                          Ferruccio Barletta &lt;ferruccio.barletta@compaq.com&gt;
+uadtc           2767/udp    # UADTC
+uadtc           2767/tcp    # UADTC
+uacs            2768/udp    # UACS
+uacs            2768/tcp    # UACS
+#                          Vishwas Lele &lt;Vishwas_Lele@appliedis.com&gt;
+singlept-mvs    2769/udp    # Single Point MVS
+singlept-mvs    2769/tcp    # Single Point MVS
+#                          Thomas Anderson &lt;anderson@clark.net&gt;
+veronica        2770/udp    # Veronica
+veronica        2770/tcp    # Veronica
+#                          Jonas Oberg &lt;jonas@coyote.org&gt;
+vergencecm      2771/udp    # Vergence CM
+vergencecm      2771/tcp    # Vergence CM
+#                          Mark Morwood &lt;markm@sentillion.com&gt;
+auris           2772/udp    # auris
+auris           2772/tcp    # auris
+#                          Francisco Saez Arance &lt;fsaez@tid.es&gt;
 rbakcup1        2773/udp   # RBackup Remote Backup
 rbakcup1        2773/tcp   # RBackup Remote Backup
 rbakcup2        2774/udp   # RBackup Remote Backup
 rbakcup2        2774/tcp   # RBackup Remote Backup
 #                         Rob Cosgrove &lt;rob@alice.net&gt;
-smpp		2775/udp    # SMPP
-smpp		2775/tcp    # SMPP
-#			   Owen Sullivan &lt;owen.sullivan@aldiscon.ie&gt;
-ridgeway1	2776/udp    # Ridgeway Systems &amp; Software
-ridgeway1	2776/tcp    # Ridgeway Systems &amp; Software
-ridgeway2	2777/udp    # Ridgeway Systems &amp; Software
-ridgeway2	2777/tcp    # Ridgeway Systems &amp; Software
-#			   Steve Read &lt;sread@ridgeway-sys.com&gt;
-gwen-sonya	2778/udp    # Gwen-Sonya 
-gwen-sonya	2778/tcp    # Gwen-Sonya 
-#			   Mark Hurst &lt;mhurst@inconnect.com&gt;
-lbc-sync	2779/udp    # LBC Sync
-lbc-sync	2779/tcp    # LBC Sync
-lbc-control	2780/udp    # LBC Control
-lbc-control	2780/tcp    # LBC Control
-#			   Keiji Michine &lt;michine@net.paso.fujitsu.co.jp&gt;
-whosells	2781/udp    # whosells
-whosells	2781/tcp    # whosells
-#			   William Randolph Royere III 
+smpp            2775/udp    # SMPP
+smpp            2775/tcp    # SMPP
+#                          Owen Sullivan &lt;owen.sullivan@aldiscon.ie&gt;
+ridgeway1       2776/udp    # Ridgeway Systems &amp; Software
+ridgeway1       2776/tcp    # Ridgeway Systems &amp; Software
+ridgeway2       2777/udp    # Ridgeway Systems &amp; Software
+ridgeway2       2777/tcp    # Ridgeway Systems &amp; Software
+#                          Steve Read &lt;sread@ridgeway-sys.com&gt;
+gwen-sonya      2778/udp    # Gwen-Sonya
+gwen-sonya      2778/tcp    # Gwen-Sonya
+#                          Mark Hurst &lt;mhurst@inconnect.com&gt;
+lbc-sync        2779/udp    # LBC Sync
+lbc-sync        2779/tcp    # LBC Sync
+lbc-control     2780/udp    # LBC Control
+lbc-control     2780/tcp    # LBC Control
+#                          Keiji Michine &lt;michine@net.paso.fujitsu.co.jp&gt;
+whosells        2781/udp    # whosells
+whosells        2781/tcp    # whosells
+#                          William Randolph Royere III
 #                          &lt;william@royere.net&gt;
-everydayrc	2782/udp    # everydayrc
-everydayrc	2782/tcp    # everydayrc
-#			   Ahti Heinla &lt;ahti@ahti.bluemoon.ee&gt;
-aises		2783/udp    # AISES
-aises		2783/tcp    # AISES
-#			   Daniel Grazioli &lt;dgrazioli@pgaero.co.uk&gt;
+everydayrc      2782/udp    # everydayrc
+everydayrc      2782/tcp    # everydayrc
+#                          Ahti Heinla &lt;ahti@ahti.bluemoon.ee&gt;
+aises           2783/udp    # AISES
+aises           2783/tcp    # AISES
+#                          Daniel Grazioli &lt;dgrazioli@pgaero.co.uk&gt;
 www-dev         2784/udp    # world wide web - development
 www-dev         2784/tcp    # world wide web - development
 aic-np          2785/udp    # aic-np
@@ -6524,312 +6524,312 @@ fryeserv        2788/tcp    # NetWare Loadable Module - Seagate Software
 #                          &lt;Joseph_M_LoPilato@notes.seagate.com&gt;
 media-agent     2789/udp    # Media Agent
 media-agent     2789/tcp    # Media Agent
-#			   Nitzan Daube &lt;nitzan@brm.com&gt;
-plgproxy	2790/udp    # PLG Proxy
-plgproxy	2790/tcp    # PLG Proxy
-#			   Charlie Hava &lt;charlieh@aks.com&gt;
-mtport-regist	2791/udp    # MT Port Registrator
-mtport-regist	2791/tcp    # MT Port Registrator
-#			   Maxim Tseitlin &lt;mtseitlin@iname.com&gt;
-f5-globalsite	2792/udp    # f5-globalsite
-f5-globalsite	2792/tcp    # f5-globalsite
-#			   Christian Saether &lt;c.saether@f5.com&gt;
-initlsmsad	2793/udp    # initlsmsad
-initlsmsad	2793/tcp    # initlsmsad
-#			   Kelly Green &lt;green@compaq.com&gt;
-aaftp		2794/udp    # aaftp
-aaftp		2794/tcp    # aaftp
-#			   E. Jay Berkenbilt &lt;ejb@ql.org&gt;
-livestats	2795/udp    # LiveStats
-livestats	2795/tcp    # LiveStats
-#			   Chris Greene &lt;cgreeneOA@avidsports.com&gt;
-ac-tech		2796/udp    # ac-tech
-ac-tech		2796/tcp    # ac-tech
-#			   Chiming Huang &lt;chuang@ac-tech.com&gt;
-esp-encap	2797/udp    # esp-encap
-esp-encap	2797/tcp    # esp-encap
-#			   Jorn Sierwald &lt;joern.sierwald@datafellows.com&gt;
-tmesis-upshot	2798/udp    # TMESIS-UPShot
-tmesis-upshot	2798/tcp    # TMESIS-UPShot
-#			   Brian Schenkenberger &lt;VAXman@TMESIS.COM&gt;
-icon-discover	2799/udp    # ICON Discover
-icon-discover	2799/tcp    # ICON Discover
-#			   Alexander Falk &lt;falk@icon.at&gt;
-acc-raid	2800/udp    # ACC RAID
-acc-raid	2800/tcp    # ACC RAID
-#			   Scott St. Clair &lt;stclair@ntc.adaptec.com&gt;
-igcp		2801/udp    # IGCP
-igcp		2801/tcp    # IGCP
-#			   David Hampson &lt;davidha@codemasters.com&gt;
-veritas-udp1	2802/udp    # Veritas UDP1
-veritas-tcp1	2802/tcp    # Veritas TCP1
-#			   Russ Thrasher &lt;Russell.Thrasher@veritas.com&gt;
-btprjctrl	2803/udp    # btprjctrl
-btprjctrl	2803/tcp    # btprjctrl
-#			   Huw Thomas &lt;huw.thomas@bt.com&gt;
-telexis-vtu	2804/udp    # Telexis VTU
-telexis-vtu	2804/tcp    # Telexis VTU
-#			   Todd White &lt;twhite@telexicorp.com&gt;
-wta-wsp-s	2805/udp    # WTA WSP-S
-wta-wsp-s	2805/tcp    # WTA WSP-S
-#			   Sebastien Bury (WAP Forum)
-#			   &lt;sebastien.bury@art.alcatel.fr&gt;
-cspuni		2806/udp    # cspuni
-cspuni		2806/tcp    # cspuni
-cspmulti	2807/udp    # cspmulti
-cspmulti	2807/tcp    # cspmulti
-#			   Terumasa Yoneda &lt;yonedat@pfu.co.jp&gt;
-j-lan-p		2808/udp    # J-LAN-P
-j-lan-p		2808/tcp    # J-LAN-P
-#			   Takeshi Sahara &lt;sahara@jdl.co.jp&gt;
-corbaloc	2809/udp    # CORBA LOC
-corbaloc	2809/tcp    # CORBA LOC
-#			   Ted McFadden &lt;mcfadden@dstc.edu.au&gt;
-netsteward	2810/udp    # Active Net Steward
-netsteward	2810/tcp    # Active Net Steward
-#			   Keith Morley &lt;keith@ndl.co.uk&gt;
-gsiftp		2811/udp    # GSI FTP
-gsiftp		2811/tcp    # GSI FTP
-#			   Von Welch &lt;vwelch@ncsa.uiuc.edu&gt;
-atmtcp		2812/udp    # atmtcp
-atmtcp		2812/tcp    # atmtcp
-#			   Werner Almesberger &lt;Werner.Almesberger@epfl.ch&gt;
-llm-pass	2813/udp    # llm-pass
-llm-pass	2813/tcp    # llm-pass
-llm-csv		2814/udp    # llm-csv
-llm-csv		2814/tcp    # llm-csv
-#			   Glen Sansoucie &lt;glen@llmwin.com&gt;
-lbc-measure	2815/udp    # LBC Measurement
-lbc-measure	2815/tcp    # LBC Measurement
-lbc-watchdog	2816/udp    # LBC Watchdog
-lbc-watchdog	2816/tcp    # LBC Watchdog
-#			   Akiyoshi Ochi &lt;akiyoshi@net.paso.fujitsu.co.jp&gt;
-nmsigport	2817/udp    # NMSig Port
-nmsigport	2817/tcp    # NMSig Port
-#			   Peter Egli &lt;peter.egli@mail.inalp.com&gt;
-rmlnk		2818/udp    # rmlnk
-rmlnk		2818/tcp    # rmlnk
-fc-faultnotify	2819/udp    # FC Fault Notification
-fc-faultnotify	2819/tcp    # FC Fault Notification
-#			   Dave Watkins &lt;davew@boi.hp.com&gt;
-univision	2820/udp    # UniVision
-univision	2820/tcp    # UniVision
-#			   Keith Ansell &lt;KeithA@fastfreenet.com&gt; 
+#                          Nitzan Daube &lt;nitzan@brm.com&gt;
+plgproxy        2790/udp    # PLG Proxy
+plgproxy        2790/tcp    # PLG Proxy
+#                          Charlie Hava &lt;charlieh@aks.com&gt;
+mtport-regist   2791/udp    # MT Port Registrator
+mtport-regist   2791/tcp    # MT Port Registrator
+#                          Maxim Tseitlin &lt;mtseitlin@iname.com&gt;
+f5-globalsite   2792/udp    # f5-globalsite
+f5-globalsite   2792/tcp    # f5-globalsite
+#                          Christian Saether &lt;c.saether@f5.com&gt;
+initlsmsad      2793/udp    # initlsmsad
+initlsmsad      2793/tcp    # initlsmsad
+#                          Kelly Green &lt;green@compaq.com&gt;
+aaftp           2794/udp    # aaftp
+aaftp           2794/tcp    # aaftp
+#                          E. Jay Berkenbilt &lt;ejb@ql.org&gt;
+livestats       2795/udp    # LiveStats
+livestats       2795/tcp    # LiveStats
+#                          Chris Greene &lt;cgreeneOA@avidsports.com&gt;
+ac-tech         2796/udp    # ac-tech
+ac-tech         2796/tcp    # ac-tech
+#                          Chiming Huang &lt;chuang@ac-tech.com&gt;
+esp-encap       2797/udp    # esp-encap
+esp-encap       2797/tcp    # esp-encap
+#                          Jorn Sierwald &lt;joern.sierwald@datafellows.com&gt;
+tmesis-upshot   2798/udp    # TMESIS-UPShot
+tmesis-upshot   2798/tcp    # TMESIS-UPShot
+#                          Brian Schenkenberger &lt;VAXman@TMESIS.COM&gt;
+icon-discover   2799/udp    # ICON Discover
+icon-discover   2799/tcp    # ICON Discover
+#                          Alexander Falk &lt;falk@icon.at&gt;
+acc-raid        2800/udp    # ACC RAID
+acc-raid        2800/tcp    # ACC RAID
+#                          Scott St. Clair &lt;stclair@ntc.adaptec.com&gt;
+igcp            2801/udp    # IGCP
+igcp            2801/tcp    # IGCP
+#                          David Hampson &lt;davidha@codemasters.com&gt;
+veritas-udp1    2802/udp    # Veritas UDP1
+veritas-tcp1    2802/tcp    # Veritas TCP1
+#                          Russ Thrasher &lt;Russell.Thrasher@veritas.com&gt;
+btprjctrl       2803/udp    # btprjctrl
+btprjctrl       2803/tcp    # btprjctrl
+#                          Huw Thomas &lt;huw.thomas@bt.com&gt;
+telexis-vtu     2804/udp    # Telexis VTU
+telexis-vtu     2804/tcp    # Telexis VTU
+#                          Todd White &lt;twhite@telexicorp.com&gt;
+wta-wsp-s       2805/udp    # WTA WSP-S
+wta-wsp-s       2805/tcp    # WTA WSP-S
+#                          Sebastien Bury (WAP Forum)
+#                          &lt;sebastien.bury@art.alcatel.fr&gt;
+cspuni          2806/udp    # cspuni
+cspuni          2806/tcp    # cspuni
+cspmulti        2807/udp    # cspmulti
+cspmulti        2807/tcp    # cspmulti
+#                          Terumasa Yoneda &lt;yonedat@pfu.co.jp&gt;
+j-lan-p         2808/udp    # J-LAN-P
+j-lan-p         2808/tcp    # J-LAN-P
+#                          Takeshi Sahara &lt;sahara@jdl.co.jp&gt;
+corbaloc        2809/udp    # CORBA LOC
+corbaloc        2809/tcp    # CORBA LOC
+#                          Ted McFadden &lt;mcfadden@dstc.edu.au&gt;
+netsteward      2810/udp    # Active Net Steward
+netsteward      2810/tcp    # Active Net Steward
+#                          Keith Morley &lt;keith@ndl.co.uk&gt;
+gsiftp          2811/udp    # GSI FTP
+gsiftp          2811/tcp    # GSI FTP
+#                          Von Welch &lt;vwelch@ncsa.uiuc.edu&gt;
+atmtcp          2812/udp    # atmtcp
+atmtcp          2812/tcp    # atmtcp
+#                          Werner Almesberger &lt;Werner.Almesberger@epfl.ch&gt;
+llm-pass        2813/udp    # llm-pass
+llm-pass        2813/tcp    # llm-pass
+llm-csv         2814/udp    # llm-csv
+llm-csv         2814/tcp    # llm-csv
+#                          Glen Sansoucie &lt;glen@llmwin.com&gt;
+lbc-measure     2815/udp    # LBC Measurement
+lbc-measure     2815/tcp    # LBC Measurement
+lbc-watchdog    2816/udp    # LBC Watchdog
+lbc-watchdog    2816/tcp    # LBC Watchdog
+#                          Akiyoshi Ochi &lt;akiyoshi@net.paso.fujitsu.co.jp&gt;
+nmsigport       2817/udp    # NMSig Port
+nmsigport       2817/tcp    # NMSig Port
+#                          Peter Egli &lt;peter.egli@mail.inalp.com&gt;
+rmlnk           2818/udp    # rmlnk
+rmlnk           2818/tcp    # rmlnk
+fc-faultnotify  2819/udp    # FC Fault Notification
+fc-faultnotify  2819/tcp    # FC Fault Notification
+#                          Dave Watkins &lt;davew@boi.hp.com&gt;
+univision       2820/udp    # UniVision
+univision       2820/tcp    # UniVision
+#                          Keith Ansell &lt;KeithA@fastfreenet.com&gt;
 vrts-at-port    2821/udp    # VERITAS Authentication Service
 vrts-at-port    2821/tcp    # VERITAS Authentication Service
 #                          Stefan Winkel &lt;stefan@veritas.com&gt;
-ka0wuc		2822/udp    # ka0wuc
-ka0wuc		2822/tcp    # ka0wuc
-#			   Kit Haskins &lt;kit@ka0wuc.org&gt;
-cqg-netlan	2823/udp    # CQG Net/LAN
-cqg-netlan	2823/tcp    # CQG Net/LAN
+ka0wuc          2822/udp    # ka0wuc
+ka0wuc          2822/tcp    # ka0wuc
+#                          Kit Haskins &lt;kit@ka0wuc.org&gt;
+cqg-netlan      2823/udp    # CQG Net/LAN
+cqg-netlan      2823/tcp    # CQG Net/LAN
 cqg-netlan-1    2824/udp    # CQG Net/Lan 1 
 cqg-netlan-1    2824/tcp    # CQG Net/LAN 1
-#			   Jeff Wood &lt;jw@cqg.com&gt;
+#                          Jeff Wood &lt;jw@cqg.com&gt;
 #               2825       (unassigned) Possibly assigned
-slc-systemlog	2826/udp    # slc systemlog
-slc-systemlog	2826/tcp    # slc systemlog
-slc-ctrlrloops	2827/udp    # slc ctrlrloops
-slc-ctrlrloops	2827/tcp    # slc ctrlrloops
-#			   Erwin Hogeweg &lt;erwin@airtech.demon.nl&gt;
-itm-lm		2828/udp    # ITM License Manager 
-itm-lm		2828/tcp    # ITM License Manager 
-#			   Miles O'Neal &lt;meo@us.itmasters.com&gt;
-silkp1		2829/udp    # silkp1
-silkp1		2829/tcp    # silkp1
-silkp2		2830/udp    # silkp2
-silkp2		2830/tcp    # silkp2
-silkp3		2831/udp    # silkp3
-silkp3		2831/tcp    # silkp3
-silkp4		2832/udp    # silkp4
-silkp4		2832/tcp    # silkp4
-#			   Erik Skyten &lt;eki@silknet.com&gt;
-glishd		2833/udp    # glishd
-glishd		2833/tcp    # glishd
-#			   Darrell Schiebel &lt;dschieb@cv.nrao.edu&gt;
-evtp		2834/udp    # EVTP
-evtp		2834/tcp    # EVTP
-evtp-data	2835/udp    # EVTP-DATA
-evtp-data	2835/tcp    # EVTP-DATA
-#			   Eric Bruno &lt;ebruno@solution-soft.com&gt; 
-catalyst	2836/udp    # catalyst
-catalyst	2836/tcp    # catalyst
-#			   Garret Tollkuhn &lt;garret@multiviewgroup.com&gt;
-repliweb	2837/udp    # Repliweb
-repliweb	2837/tcp    # Repliweb
-#			   William Orme &lt;bill@repliweb.com&gt;
-starbot		2838/udp    # Starbot
-starbot		2838/tcp    # Starbot
-#			   Markus Sabadello &lt;sabadello@starbot.org&gt;
-nmsigport	2839/udp    # NMSigPort
-nmsigport	2839/tcp    # NMSigPort
-#			   Peter Egli &lt;peter.egli@mail.inalp.com&gt;
-l3-exprt	2840/udp    # l3-exprt
-l3-exprt	2840/tcp    # l3-exprt
-l3-ranger	2841/udp    # l3-ranger
-l3-ranger	2841/tcp    # l3-ranger
-l3-hawk		2842/udp    # l3-hawk
-l3-hawk		2842/tcp    # l3-hawk
-#			   Dolores Scott &lt;dolores.scott@l-3security.com&gt;
-pdnet		2843/udp    # PDnet
-pdnet		2843/tcp    # PDnet
-#			   Torsten Scheffler &lt;torsten.scheffler@apex.de&gt;
-bpcp-poll	2844/udp    # BPCP POLL
-bpcp-poll	2844/tcp    # BPCP POLL
-bpcp-trap	2845/udp    # BPCP TRAP
-bpcp-trap	2845/tcp    # BPCP TRAP
-#			   Steve Van Duser
+slc-systemlog   2826/udp    # slc systemlog
+slc-systemlog   2826/tcp    # slc systemlog
+slc-ctrlrloops  2827/udp    # slc ctrlrloops
+slc-ctrlrloops  2827/tcp    # slc ctrlrloops
+#                          Erwin Hogeweg &lt;erwin@airtech.demon.nl&gt;
+itm-lm          2828/udp    # ITM License Manager
+itm-lm          2828/tcp    # ITM License Manager
+#                          Miles O'Neal &lt;meo@us.itmasters.com&gt;
+silkp1          2829/udp    # silkp1
+silkp1          2829/tcp    # silkp1
+silkp2          2830/udp    # silkp2
+silkp2          2830/tcp    # silkp2
+silkp3          2831/udp    # silkp3
+silkp3          2831/tcp    # silkp3
+silkp4          2832/udp    # silkp4
+silkp4          2832/tcp    # silkp4
+#                          Erik Skyten &lt;eki@silknet.com&gt;
+glishd          2833/udp    # glishd
+glishd          2833/tcp    # glishd
+#                          Darrell Schiebel &lt;dschieb@cv.nrao.edu&gt;
+evtp            2834/udp    # EVTP
+evtp            2834/tcp    # EVTP
+evtp-data       2835/udp    # EVTP-DATA
+evtp-data       2835/tcp    # EVTP-DATA
+#                          Eric Bruno &lt;ebruno@solution-soft.com&gt;
+catalyst        2836/udp    # catalyst
+catalyst        2836/tcp    # catalyst
+#                          Garret Tollkuhn &lt;garret@multiviewgroup.com&gt;
+repliweb        2837/udp    # Repliweb
+repliweb        2837/tcp    # Repliweb
+#                          William Orme &lt;bill@repliweb.com&gt;
+starbot         2838/udp    # Starbot
+starbot         2838/tcp    # Starbot
+#                          Markus Sabadello &lt;sabadello@starbot.org&gt;
+nmsigport       2839/udp    # NMSigPort
+nmsigport       2839/tcp    # NMSigPort
+#                          Peter Egli &lt;peter.egli@mail.inalp.com&gt;
+l3-exprt        2840/udp    # l3-exprt
+l3-exprt        2840/tcp    # l3-exprt
+l3-ranger       2841/udp    # l3-ranger
+l3-ranger       2841/tcp    # l3-ranger
+l3-hawk         2842/udp    # l3-hawk
+l3-hawk         2842/tcp    # l3-hawk
+#                          Dolores Scott &lt;dolores.scott@l-3security.com&gt;
+pdnet           2843/udp    # PDnet
+pdnet           2843/tcp    # PDnet
+#                          Torsten Scheffler &lt;torsten.scheffler@apex.de&gt;
+bpcp-poll       2844/udp    # BPCP POLL
+bpcp-poll       2844/tcp    # BPCP POLL
+bpcp-trap       2845/udp    # BPCP TRAP
+bpcp-trap       2845/tcp    # BPCP TRAP
+#                          Steve Van Duser
 #                          &lt;steve.vanduser@bestpower.gensig.com&gt;
-aimpp-hello	2846/udp    # AIMPP Hello
-aimpp-hello	2846/tcp    # AIMPP Hello
-aimpp-port-req	2847/udp    # AIMPP Port Req
-aimpp-port-req	2847/tcp    # AIMPP Port Req
-#			   Brian Martinicky
+aimpp-hello     2846/udp    # AIMPP Hello
+aimpp-hello     2846/tcp    # AIMPP Hello
+aimpp-port-req  2847/udp    # AIMPP Port Req
+aimpp-port-req  2847/tcp    # AIMPP Port Req
+#                          Brian Martinicky
 #                          &lt;Brian_Martinicky@automationintelligence.com&gt;
-amt-blc-port	2848/udp    # AMT-BLC-PORT
-amt-blc-port	2848/tcp    # AMT-BLC-PORT
-#			   Sandra Frulloni &lt;frulloni.amtec@interbusiness.it&gt;
-fxp		2849/udp    # FXP
-fxp		2849/tcp    # FXP
-#			   Martin Lichtin &lt;lichtin@oanda.com&gt;
-metaconsole	2850/udp    # MetaConsole
-metaconsole	2850/tcp    # MetaConsole
-#			   Rakesh Mahajan &lt;rmahajan@netaphor-software.com&gt;
-webemshttp	2851/udp    # webemshttp
-webemshttp	2851/tcp    # webemshttp
-#			   Stephen Tsun &lt;stsun@jetstream.com&gt;
-bears-01	2852/udp    # bears-01
-bears-01	2852/tcp    # bears-01
-#			   Bruce McKinnon &lt;brucemck@bears.aust.com&gt;
-ispipes		2853/udp    # ISPipes
-ispipes		2853/tcp    # ISPipes
-#			   Rajesh Nandyalam &lt;rnandyal@emc.com&gt;
-infomover	2854/udp    # InfoMover
-infomover	2854/tcp    # InfoMover
-#			   Carla Caputo &lt;caputo@emc.com&gt;
-cesdinv		2856/udp    # cesdinv
-cesdinv		2856/tcp    # cesdinv
-#			   Yoshiaki Tokumoto &lt;toku@pfu.co.jp&gt;
-simctlp		2857/udp    # SimCtIP
-simctlp		2857/tcp    # SimCtIP
-#			   Christian Zietz &lt;czietz@gmx.net&gt;
-ecnp		2858/udp    # ECNP
-ecnp		2858/tcp    # ECNP
-#			   Robert Reimiller &lt;bob@certsoft.com&gt;
-activememory	2859/udp    # Active Memory
-activememory	2859/tcp    # Active Memory
-#			   Joe Graham &lt;joe@edaconsulting.com&gt;
-dialpad-voice1	2860/udp    # Dialpad Voice 1
-dialpad-voice1	2860/tcp    # Dialpad Voice 1
-dialpad-voice2	2861/udp    # Dialpad Voice 2
-dialpad-voice2	2861/tcp    # Dialpad Voice 2
-#			   Wongyu Cho &lt;wgcho@dialpad.com&gt;
-ttg-protocol	2862/udp    # TTG Protocol
-ttg-protocol	2862/tcp    # TTG Protocol
-#			   Mark Boler &lt;markb@ttgsoftware.com&gt;
-sonardata	2863/udp    # Sonar Data
-sonardata	2863/tcp    # Sonar Data
-#			   Ian Higginbottom &lt;sonardata@sonardata.com&gt;
-astromed-main	2864/udp    # main 5001 cmd
-astromed-main	2864/tcp    # main 5001 cmd
-#			   Chris Tate &lt;ctate@astromed.com&gt;
-pit-vpn		2865/udp    # pit-vpn
-pit-vpn		2865/tcp    # pit-vpn
-#			   Norbert Sendetzky &lt;norbert@linuxnetworks.de&gt;
-iwlistener	2866/udp    # iwlistener
-iwlistener	2866/tcp    # iwlistener
-#			   Fred Surr &lt;quest_iana@oz.quest.com&gt;
-esps-portal	2867/udp    # esps-portal
-esps-portal	2867/tcp    # esps-portal
-#			   Nicholas Stowfis &lt;nstowfis@esps.com&gt;
-npep-messaging	2868/udp    # NPEP Messaging
-npep-messaging	2868/tcp    # NPEP Messaging
-#			   Kristian A. Bognaes &lt;kbo@norman.no&gt;
-icslap		2869/udp    # ICSLAP
-icslap		2869/tcp    # ICSLAP
-#			   Richard Lamb &lt;rlamb@microsoft.com&gt;
-daishi		2870/udp    # daishi
-daishi		2870/tcp    # daishi
-#			   Patrick Chipman &lt;pchipman@memphis.edu&gt;
-msi-selectplay	2871/udp    # MSI Select Play
-msi-selectplay	2871/tcp    # MSI Select Play
-#			   Paul Fonte &lt;paul_fonte@mediastation.com&gt;
-radix		2872/udp    # RADIX
-radix		2872/tcp    # RADIX
-#			   Stein Roger Skaflotten
+amt-blc-port    2848/udp    # AMT-BLC-PORT
+amt-blc-port    2848/tcp    # AMT-BLC-PORT
+#                          Sandra Frulloni &lt;frulloni.amtec@interbusiness.it&gt;
+fxp             2849/udp    # FXP
+fxp             2849/tcp    # FXP
+#                          Martin Lichtin &lt;lichtin@oanda.com&gt;
+metaconsole     2850/udp    # MetaConsole
+metaconsole     2850/tcp    # MetaConsole
+#                          Rakesh Mahajan &lt;rmahajan@netaphor-software.com&gt;
+webemshttp      2851/udp    # webemshttp
+webemshttp      2851/tcp    # webemshttp
+#                          Stephen Tsun &lt;stsun@jetstream.com&gt;
+bears-01        2852/udp    # bears-01
+bears-01        2852/tcp    # bears-01
+#                          Bruce McKinnon &lt;brucemck@bears.aust.com&gt;
+ispipes         2853/udp    # ISPipes
+ispipes         2853/tcp    # ISPipes
+#                          Rajesh Nandyalam &lt;rnandyal@emc.com&gt;
+infomover       2854/udp    # InfoMover
+infomover       2854/tcp    # InfoMover
+#                          Carla Caputo &lt;caputo@emc.com&gt;
+cesdinv         2856/udp    # cesdinv
+cesdinv         2856/tcp    # cesdinv
+#                          Yoshiaki Tokumoto &lt;toku@pfu.co.jp&gt;
+simctlp         2857/udp    # SimCtIP
+simctlp         2857/tcp    # SimCtIP
+#                          Christian Zietz &lt;czietz@gmx.net&gt;
+ecnp            2858/udp    # ECNP
+ecnp            2858/tcp    # ECNP
+#                          Robert Reimiller &lt;bob@certsoft.com&gt;
+activememory    2859/udp    # Active Memory
+activememory    2859/tcp    # Active Memory
+#                          Joe Graham &lt;joe@edaconsulting.com&gt;
+dialpad-voice1  2860/udp    # Dialpad Voice 1
+dialpad-voice1  2860/tcp    # Dialpad Voice 1
+dialpad-voice2  2861/udp    # Dialpad Voice 2
+dialpad-voice2  2861/tcp    # Dialpad Voice 2
+#                          Wongyu Cho &lt;wgcho@dialpad.com&gt;
+ttg-protocol    2862/udp    # TTG Protocol
+ttg-protocol    2862/tcp    # TTG Protocol
+#                          Mark Boler &lt;markb@ttgsoftware.com&gt;
+sonardata       2863/udp    # Sonar Data
+sonardata       2863/tcp    # Sonar Data
+#                          Ian Higginbottom &lt;sonardata@sonardata.com&gt;
+astromed-main   2864/udp    # main 5001 cmd
+astromed-main   2864/tcp    # main 5001 cmd
+#                          Chris Tate &lt;ctate@astromed.com&gt;
+pit-vpn         2865/udp    # pit-vpn
+pit-vpn         2865/tcp    # pit-vpn
+#                          Norbert Sendetzky &lt;norbert@linuxnetworks.de&gt;
+iwlistener      2866/udp    # iwlistener
+iwlistener      2866/tcp    # iwlistener
+#                          Fred Surr &lt;quest_iana@oz.quest.com&gt;
+esps-portal     2867/udp    # esps-portal
+esps-portal     2867/tcp    # esps-portal
+#                          Nicholas Stowfis &lt;nstowfis@esps.com&gt;
+npep-messaging  2868/udp    # NPEP Messaging
+npep-messaging  2868/tcp    # NPEP Messaging
+#                          Kristian A. Bognaes &lt;kbo@norman.no&gt;
+icslap          2869/udp    # ICSLAP
+icslap          2869/tcp    # ICSLAP
+#                          Richard Lamb &lt;rlamb@microsoft.com&gt;
+daishi          2870/udp    # daishi
+daishi          2870/tcp    # daishi
+#                          Patrick Chipman &lt;pchipman@memphis.edu&gt;
+msi-selectplay  2871/udp    # MSI Select Play
+msi-selectplay  2871/tcp    # MSI Select Play
+#                          Paul Fonte &lt;paul_fonte@mediastation.com&gt;
+radix           2872/udp    # RADIX
+radix           2872/tcp    # RADIX
+#                          Stein Roger Skaflotten
 #                          &lt;sskaflot@online.no&gt;
-paspar2-zoomin	2873/udp    # PASPAR2 ZoomIn
-paspar2-zoomin	2873/tcp    # PASPAR2 ZoomIn
-#			   Amonn David &lt;amnon@paspar2.com&gt;
-dxmessagebase1	2874/udp    # dxmessagebase1
-dxmessagebase1	2874/tcp    # dxmessagebase1
-dxmessagebase2	2875/udp    # dxmessagebase2
-dxmessagebase2	2875/tcp    # dxmessagebase2
-#			   Ozz Nixon &lt;root@delphix.com&gt;
-sps-tunnel	2876/udp    # SPS Tunnel
-sps-tunnel	2876/tcp    # SPS Tunnel
-#			   Bill McIntosh &lt;bmcintosh@fortresstech.com&gt;
-bluelance	2877/udp    # BLUELANCE
-bluelance	2877/tcp    # BLUELANCE
-#			   Michael Padrezas &lt;mpaderzas@bluelance.com&gt;
-aap		2878/udp    # AAP
-aap		2878/tcp    # AAP
-#			   Stephen Hanna &lt;steve.hanna@sun.com&gt;
-ucentric-ds	2879/udp    # ucentric-ds
-ucentric-ds	2879/tcp    # ucentric-ds
-#			   Alex Vasilevsky &lt;alexv@204.165.216.115&gt;
-synapse		2880/udp    # Synapse Transport
-synapse		2880/tcp    # Synapse Transport
-#			   Ali Fracyon &lt;sxdev@modulardreams.com&gt;
-ndsp		2881/udp    # NDSP
-ndsp		2881/tcp    # NDSP
-ndtp		2882/udp    # NDTP
-ndtp		2882/tcp    # NDTP
-ndnp		2883/udp    # NDNP
-ndnp		2883/tcp    # NDNP
-#			   Khelben Blackstaff &lt;khelben@gmx.at&gt;
-flashmsg	2884/udp    # Flash Msg
-flashmsg	2884/tcp    # Flash Msg
-#			   Jeffrey Zinkerman &lt;jeff@zinknet.com&gt;
-topflow		2885/udp    # TopFlow
-topflow		2885/tcp    # TopFlow
-#			   Ted Ross &lt;ross@toplayer.com&gt;
+paspar2-zoomin  2873/udp    # PASPAR2 ZoomIn
+paspar2-zoomin  2873/tcp    # PASPAR2 ZoomIn
+#                          Amonn David &lt;amnon@paspar2.com&gt;
+dxmessagebase1  2874/udp    # dxmessagebase1
+dxmessagebase1  2874/tcp    # dxmessagebase1
+dxmessagebase2  2875/udp    # dxmessagebase2
+dxmessagebase2  2875/tcp    # dxmessagebase2
+#                          Ozz Nixon &lt;root@delphix.com&gt;
+sps-tunnel      2876/udp    # SPS Tunnel
+sps-tunnel      2876/tcp    # SPS Tunnel
+#                          Bill McIntosh &lt;bmcintosh@fortresstech.com&gt;
+bluelance       2877/udp    # BLUELANCE
+bluelance       2877/tcp    # BLUELANCE
+#                          Michael Padrezas &lt;mpaderzas@bluelance.com&gt;
+aap             2878/udp    # AAP
+aap             2878/tcp    # AAP
+#                          Stephen Hanna &lt;steve.hanna@sun.com&gt;
+ucentric-ds     2879/udp    # ucentric-ds
+ucentric-ds     2879/tcp    # ucentric-ds
+#                          Alex Vasilevsky &lt;alexv@204.165.216.115&gt;
+synapse         2880/udp    # Synapse Transport
+synapse         2880/tcp    # Synapse Transport
+#                          Ali Fracyon &lt;sxdev@modulardreams.com&gt;
+ndsp            2881/udp    # NDSP
+ndsp            2881/tcp    # NDSP
+ndtp            2882/udp    # NDTP
+ndtp            2882/tcp    # NDTP
+ndnp            2883/udp    # NDNP
+ndnp            2883/tcp    # NDNP
+#                          Khelben Blackstaff &lt;khelben@gmx.at&gt;
+flashmsg        2884/udp    # Flash Msg
+flashmsg        2884/tcp    # Flash Msg
+#                          Jeffrey Zinkerman &lt;jeff@zinknet.com&gt;
+topflow         2885/udp    # TopFlow
+topflow         2885/tcp    # TopFlow
+#                          Ted Ross &lt;ross@toplayer.com&gt;
 responselogic   2886/udp    # RESPONSELOGIC
 responselogic   2886/tcp    # RESPONSELOGIC
-#			   Bruce Casey &lt;bcasey@responselogic.com&gt;
+#                          Bruce Casey &lt;bcasey@responselogic.com&gt;
 aironetddp      2887/udp    # aironet
 aironetddp      2887/tcp    # aironet
-#			   Victor Griswold &lt;vgris@aironet.com&gt; 	
+#                          Victor Griswold &lt;vgris@aironet.com&gt;
 spcsdlobby      2888/udp    # SPCSDLOBBY
 spcsdlobby      2888/tcp    # SPCSDLOBBY
-#			   Matthew Williams &lt;SPCsd_MWDD@hotmail.com&gt; 
+#                          Matthew Williams &lt;SPCsd_MWDD@hotmail.com&gt;
 rsom            2889/udp    # RSOM
 rsom            2889/tcp    # RSOM
-#			   Justine Higgins &lt;iana@corsof.com&gt;
+#                          Justine Higgins &lt;iana@corsof.com&gt;
 cspclmulti      2890/udp    # CSPCLMULTI
 cspclmulti      2890/tcp    # CSPCLMULTI
-#			   Yoneda Terumasa &lt;yonedat@pfu.co.jp&gt;
+#                          Yoneda Terumasa &lt;yonedat@pfu.co.jp&gt;
 cinegrfx-elmd   2891/udp    # CINEGRFX-ELMD License Manager
 cinegrfx-elmd   2891/tcp    # CINEGRFX-ELMD License Manager
-#			   Greg Ercolano &lt;erco@cinegrfx.com&gt;
+#                          Greg Ercolano &lt;erco@cinegrfx.com&gt;
 snifferdata     2892/udp    # SNIFFERDATA
 snifferdata     2892/tcp    # SNIFFERDATA
-#			   Jeff Mangasarian &lt;jeffrey_mangasarian@nai.com&gt;
+#                          Jeff Mangasarian &lt;jeffrey_mangasarian@nai.com&gt;
 vseconnector    2893/udp    # VSECONNECTOR
 vseconnector    2893/tcp    # VSECONNECTOR
-#			   Ingo Franzki &lt;ifranzki@de.ibm.com&gt;
+#                          Ingo Franzki &lt;ifranzki@de.ibm.com&gt;
 abacus-remote   2894/udp    # ABACUS-REMOTE
 abacus-remote   2894/tcp    # ABACUS-REMOTE
-#			   Mike Bello &lt;mbello@zarak.com&gt;
+#                          Mike Bello &lt;mbello@zarak.com&gt;
 natuslink       2895/udp    # NATUS LINK
 natuslink       2895/tcp    # NATUS LINK
-#			   Jonathan Mergy &lt;mergy@natus.com&gt;
+#                          Jonathan Mergy &lt;mergy@natus.com&gt;
 ecovisiong6-1   2896/udp    # ECOVISIONG6-1
 ecovisiong6-1   2896/tcp    # ECOVISIONG6-1
-#			   Henrik Holst &lt;henrik.holst@ecovision.se&gt;	
-citrix-rtmp	2897/udp    # Citrix RTMP
-citrix-rtmp	2897/tcp    # Citrix RTMP
-#			   Myk Willis &lt;myk.willis@citrix.com&gt;
+#                          Henrik Holst &lt;henrik.holst@ecovision.se&gt;
+citrix-rtmp     2897/udp    # Citrix RTMP
+citrix-rtmp     2897/tcp    # Citrix RTMP
+#                          Myk Willis &lt;myk.willis@citrix.com&gt;
 appliance-cfg   2898/udp    # APPLIANCE-CFG
 appliance-cfg   2898/tcp    # APPLIANCE-CFG
 #                          Gary A. James &lt;gary.james@criticallink.com&gt;
@@ -6865,35 +6865,35 @@ webmethods-b2b  2907/tcp    # WEBMETHODS B2B
 mao             2908/udp    # mao
 mao             2908/tcp    # mao
 #                          Marc Baudoin &lt;babafou@babafou.eu.org&gt;
-funk-dialout	2909/udp    # Funk Dialout
-funk-dialout 	2909/tcp    # Funk Dialout
-#			   Cimarron Boozer &lt;cboozer@funk.com&gt;
-tdaccess	2910/udp    # TDAccess
-tdaccess	2910/tcp    # TDAccess
-#			   Tom Haapanen &lt;tomh@metrics.com&gt;
+funk-dialout    2909/udp    # Funk Dialout
+funk-dialout    2909/tcp    # Funk Dialout
+#                          Cimarron Boozer &lt;cboozer@funk.com&gt;
+tdaccess        2910/udp    # TDAccess
+tdaccess        2910/tcp    # TDAccess
+#                          Tom Haapanen &lt;tomh@metrics.com&gt;
 blockade        2911/udp    # Blockade
 blockade        2911/tcp    # Blockade
 #                          VP - Research &amp; Development &lt;development@blockade.com&gt;
-epicon		2912/udp    # Epicon
-epicon		2912/tcp    # Epicon
-#			   Michael Khalandovsky &lt;mlk@epicon.com&gt;
-boosterware	2913/udp    # Booster Ware
-boosterware	2913/tcp    # Booster Ware
-#		 	   Ido Ben-David &lt;dgntcom@netvision.net.il&gt;
+epicon          2912/udp    # Epicon
+epicon          2912/tcp    # Epicon
+#                          Michael Khalandovsky &lt;mlk@epicon.com&gt;
+boosterware     2913/udp    # Booster Ware
+boosterware     2913/tcp    # Booster Ware
+#                          Ido Ben-David &lt;dgntcom@netvision.net.il&gt;
 gamelobby       2914/udp    # Game Lobby
 gamelobby       2914/tcp    # Game Lobby
 #                          Paul Ford-Hutchinson &lt;paulfordh@uk.ibm.com&gt;
-tksocket	2915/udp    # TK Socket
-tksocket	2915/tcp    # TK Socket
-#			   Alan Fahrner &lt;alan@protix.com&gt;
-elvin_server	2916/udp    # Elvin Server
-elvin_server	2916/tcp    # Elvin Server
-elvin_client	2917/udp    # Elvin Client
-elvin_client	2917/tcp    # Elvin Client
-#			   David Arnold &lt;davida@pobox.com&gt;
-kastenchasepad	2918/udp    # Kasten Chase Pad
-kastenchasepad	2918/tcp    # Kasten Chase Pad
-#			   Marc Gauthier &lt;mgau@kastenchase.com&gt;
+tksocket        2915/udp    # TK Socket
+tksocket        2915/tcp    # TK Socket
+#                          Alan Fahrner &lt;alan@protix.com&gt;
+elvin_server    2916/udp    # Elvin Server
+elvin_server    2916/tcp    # Elvin Server
+elvin_client    2917/udp    # Elvin Client
+elvin_client    2917/tcp    # Elvin Client
+#                          David Arnold &lt;davida@pobox.com&gt;
+kastenchasepad  2918/udp    # Kasten Chase Pad
+kastenchasepad  2918/tcp    # Kasten Chase Pad
+#                          Marc Gauthier &lt;mgau@kastenchase.com&gt;
 roboer          2919/udp    # ROBOER
 roboer          2919/tcp    # ROBOER
 #                          Paul Snook &lt;paul.snook@heroix.co.uk&gt;
@@ -7041,35 +7041,35 @@ index-net       2970/tcp    # INDEX-NET
 netclip         2971/udp    # NetClip clipboard daemon
 netclip         2971/tcp    # NetClip clipboard daemon
 #                          Rudi Chiarito &lt;nutello@sweetness.com&gt;
-pmsm-webrctl	2972/udp    # PMSM Webrctl
-pmsm-webrctl	2972/tcp    # PMSM Webrctl
-#			   Markus Michels &lt;mmi@pmsmicado.com&gt;
-svnetworks	2973/udp    # SV Networks
-svnetworks	2973/tcp    # SV Networks
-#			   Sylvia Siu &lt;ssiu@svnetworks.com&gt;
-signal		2974/udp    # Signal
-signal		2974/tcp    # Signal
-#			   Wyatt Williams &lt;wyattw@icall.com&gt;
-fjmpcm		2975/udp    # Fujitsu Configuration Management Service
-fjmpcm		2975/tcp    # Fujitsu Configuration Management Service
-#			   Hiroki Kawano &lt;kawano@saint.nm.fujitsu.co.jp&gt;
-cns-srv-port	2976/udp    # CNS Server Port
-cns-srv-port	2976/tcp    # CNS Server Port
-#			   Ram Golla &lt;rgolla@cisco.com&gt;
-ttc-etap-ns	2977/udp    # TTCs Enterprise Test Access Protocol - NS
-ttc-etap-ns	2977/tcp    # TTCs Enterprise Test Access Protocol - NS
-ttc-etap-ds	2978/udp    # TTCs Enterprise Test Access Protocol - DS
-ttc-etap-ds	2978/tcp    # TTCs Enterprise Test Access Protocol - DS
-#			   Daniel Becker &lt;beckerd@ttc.com&gt;
-h263-video	2979/udp    # H.263 Video Streaming 
-h263-video	2979/tcp    # H.263 Video Streaming 
-#			   Jauvane C. de Oliveira &lt;jauvane@acm.org&gt;
-wimd		2980/udp    # Instant Messaging Service
-wimd		2980/tcp    # Instant Messaging Service
-#			   Kevin Birch &lt;kbirch@pobox.com&gt;
-mylxamport	2981/udp    # MYLXAMPORT
-mylxamport	2981/tcp    # MYLXAMPORT
-#			   Wei Gao &lt;wei@mylex.com&gt;
+pmsm-webrctl    2972/udp    # PMSM Webrctl
+pmsm-webrctl    2972/tcp    # PMSM Webrctl
+#                          Markus Michels &lt;mmi@pmsmicado.com&gt;
+svnetworks      2973/udp    # SV Networks
+svnetworks      2973/tcp    # SV Networks
+#                          Sylvia Siu &lt;ssiu@svnetworks.com&gt;
+signal          2974/udp    # Signal
+signal          2974/tcp    # Signal
+#                          Wyatt Williams &lt;wyattw@icall.com&gt;
+fjmpcm          2975/udp    # Fujitsu Configuration Management Service
+fjmpcm          2975/tcp    # Fujitsu Configuration Management Service
+#                          Hiroki Kawano &lt;kawano@saint.nm.fujitsu.co.jp&gt;
+cns-srv-port    2976/udp    # CNS Server Port
+cns-srv-port    2976/tcp    # CNS Server Port
+#                          Ram Golla &lt;rgolla@cisco.com&gt;
+ttc-etap-ns     2977/udp    # TTCs Enterprise Test Access Protocol - NS
+ttc-etap-ns     2977/tcp    # TTCs Enterprise Test Access Protocol - NS
+ttc-etap-ds     2978/udp    # TTCs Enterprise Test Access Protocol - DS
+ttc-etap-ds     2978/tcp    # TTCs Enterprise Test Access Protocol - DS
+#                          Daniel Becker &lt;beckerd@ttc.com&gt;
+h263-video      2979/udp    # H.263 Video Streaming
+h263-video      2979/tcp    # H.263 Video Streaming
+#                          Jauvane C. de Oliveira &lt;jauvane@acm.org&gt;
+wimd            2980/udp    # Instant Messaging Service
+wimd            2980/tcp    # Instant Messaging Service
+#                          Kevin Birch &lt;kbirch@pobox.com&gt;
+mylxamport      2981/udp    # MYLXAMPORT
+mylxamport      2981/tcp    # MYLXAMPORT
+#                          Wei Gao &lt;wei@mylex.com&gt;
 iwb-whiteboard  2982/udp    # IWB-WHITEBOARD
 iwb-whiteboard  2982/tcp    # IWB-WHITEBOARD
 #                          David W. Radcliffe &lt;davidr@adicarte.co.uk&gt;
@@ -7110,18 +7110,18 @@ veritas-vis2    2994/tcp    # VERITAS VIS2
 idrs            2995/udp    # IDRS
 idrs            2995/tcp    # IDRS
 #                          Jeff Eaton &lt;jeaton@intermec.com&gt;
-vsixml		2996/udp    # vsixml
-vsixml		2996/tcp    # vsixml
-#			   Rob Juergens &lt;robj@vsi.com&gt;
+vsixml          2996/udp    # vsixml
+vsixml          2996/tcp    # vsixml
+#                          Rob Juergens &lt;robj@vsi.com&gt;
 rebol           2997/udp    # REBOL
-rebol		2997/tcp    # REBOL
+rebol           2997/tcp    # REBOL
 #                          Holger Kruse &lt;holger@rebol.net&gt;
-realsecure	2998/udp    # Real Secure
-realsecure	2998/tcp    # Real Secure
-#			   Tim Farley &lt;TFarley@iss.net&gt;
-remoteware-un	2999/udp    # RemoteWare Unassigned
-remoteware-un	2999/tcp    # RemoteWare Unassigned
-#			   Tim Farley &lt;Tim.Farley@xcellenet.com&gt;
+realsecure      2998/udp    # Real Secure
+realsecure      2998/tcp    # Real Secure
+#                          Tim Farley &lt;TFarley@iss.net&gt;
+remoteware-un   2999/udp    # RemoteWare Unassigned
+remoteware-un   2999/tcp    # RemoteWare Unassigned
+#                          Tim Farley &lt;Tim.Farley@xcellenet.com&gt;
 hbci            3000/udp    # HBCI
 hbci            3000/tcp    # HBCI
 #                          Kurt Haubner &lt;haubner@ibm.net&gt;
@@ -7200,9 +7200,9 @@ csregagent      3022/tcp    # CSREGAGENT
 #                          Nedelcho Stanev &lt;nstanev@csoft.bg&gt;
 magicnotes      3023/udp    # magicnotes
 magicnotes      3023/tcp    # magicnotes
-#                          Karl Edwall &lt;karl@magicnotes.com&gt;	
+#                          Karl Edwall &lt;karl@magicnotes.com&gt;
 nds_sso         3024/udp    # NDS_SSO
-nds_sso	        3024/tcp    # NDS_SSO
+nds_sso         3024/tcp    # NDS_SSO
 #                          Mel Oyler &lt;mel@novell.com&gt;
 arepa-raft      3025/udp    # Arepa Raft 
 arepa-raft      3025/tcp    # Arepa Raft 
@@ -7231,10 +7231,10 @@ pdb             3033/tcp    # PDB
 #                          Don Bowman &lt;don@pixstream.com&gt;
 osmosis-aeea    3034/udp    # Osmosis / Helix (R) AEEA Port
 osmosis-aeea    3034/tcp    # Osmosis / Helix (R) AEEA Port
-#                          Larry Atkin &lt;latkin@commongrnd.com&gt;	
+#                          Larry Atkin &lt;latkin@commongrnd.com&gt;
 fjsv-gssagt     3035/udp    # FJSV gssagt
 fjsv-gssagt     3035/tcp    # FJSV gssagt
-#                          Tomoji Koike &lt;koike@ael.fujitsu.co.jp&gt;	
+#                          Tomoji Koike &lt;koike@ael.fujitsu.co.jp&gt;
 hagel-dump      3036/udp    # Hagel DUMP
 hagel-dump      3036/tcp    # Hagel DUMP
 #                          Haim Gelfenbeyn &lt;haim@hageltech.com&gt;
@@ -7255,7 +7255,7 @@ di-traceware    3041/tcp    # di-traceware
 #                          Carlos Hung &lt;chung@digisle.net&gt;
 journee         3042/udp    # journee
 journee         3042/tcp    # journee
-#                          Kevin Calman &lt;postmaster@journee.com&gt;	
+#                          Kevin Calman &lt;postmaster@journee.com&gt;
 brp             3043/udp    # BRP
 brp             3043/tcp    # BRP
 #                          Greg Gee &lt;ggee@hns.com&gt;
@@ -7279,66 +7279,66 @@ nsws            3049/tcp    # NSWS
 #                          Ray Gwinn &lt;p00321@psilink.com&gt;
 gds_db          3050/udp    # gds_db
 gds_db          3050/tcp    # gds_db
-#                          Madhukar N. Thakur &lt;mthakur@interbase.com&gt;	
-galaxy-server	3051/udp    # Galaxy Server
-galaxy-server	3051/tcp    # Galaxy Server
-#			   Michael Andre &lt;mandre@gts-tkts.com&gt;
+#                          Madhukar N. Thakur &lt;mthakur@interbase.com&gt;
+galaxy-server   3051/udp    # Galaxy Server
+galaxy-server   3051/tcp    # Galaxy Server
+#                          Michael Andre &lt;mandre@gts-tkts.com&gt;
 apc-3052        3052/udp    # APC 3052
 apc-3052        3052/tcp    # APC 3052
 #                          American Power Conversion &lt;ports@apcc.com&gt;
-dsom-server	3053/udp    # dsom-server
-dsom-server	3053/tcp    # dsom-server
-#			   Daniel Sisk &lt;danielr.sisk@pnl.gov&gt;
-amt-cnf-prot	3054/udp    # AMT CNF PROT
-amt-cnf-prot	3054/tcp    # AMT CNF PROT
-#			   Marco Marcucci &lt;mmarcucci.amtec@interbusiness.it&gt;
-policyserver	3055/udp    # Policy Server
-policyserver	3055/tcp    # Policy Server
-#			   Mark Garti &lt;mgarti@sonusnet.com&gt;
-cdl-server	3056/udp    # CDL Server
-cdl-server	3056/tcp    # CDL Server
-#			   Paul Roberts &lt;PaulRoberts@engineer.com&gt;
-goahead-fldup	3057/udp    # GoAhead FldUp
-goahead-fldup	3057/tcp    # GoAhead FldUp
-#			   Alan Pickrell &lt;alanp@goahead.com&gt;
-videobeans	3058/udp    # videobeans
-videobeans	3058/tcp    # videobeans
-#			   Hiroyuki Takahashi &lt;hiro.takahashi@eng.Sun.COM&gt;
-qsoft		3059/udp    # qsoft
-qsoft		3059/tcp    # qsoft
-#			   James Kunz &lt;jkunz@earlhaig.com&gt;
-interserver	3060/udp    # interserver
-interserver	3060/tcp    # interserver
-#			   Madhukar N. Thakur &lt;mthakur@interbase.com&gt;
-cautcpd		3061/udp    # cautcpd
-cautcpd		3061/tcp    # cautcpd
-ncacn-ip-tcp	3062/udp    # ncacn-ip-tcp
-ncacn-ip-tcp	3062/tcp    # ncacn-ip-tcp
+dsom-server     3053/udp    # dsom-server
+dsom-server     3053/tcp    # dsom-server
+#                          Daniel Sisk &lt;danielr.sisk@pnl.gov&gt;
+amt-cnf-prot    3054/udp    # AMT CNF PROT
+amt-cnf-prot    3054/tcp    # AMT CNF PROT
+#                          Marco Marcucci &lt;mmarcucci.amtec@interbusiness.it&gt;
+policyserver    3055/udp    # Policy Server
+policyserver    3055/tcp    # Policy Server
+#                          Mark Garti &lt;mgarti@sonusnet.com&gt;
+cdl-server      3056/udp    # CDL Server
+cdl-server      3056/tcp    # CDL Server
+#                          Paul Roberts &lt;PaulRoberts@engineer.com&gt;
+goahead-fldup   3057/udp    # GoAhead FldUp
+goahead-fldup   3057/tcp    # GoAhead FldUp
+#                          Alan Pickrell &lt;alanp@goahead.com&gt;
+videobeans      3058/udp    # videobeans
+videobeans      3058/tcp    # videobeans
+#                          Hiroyuki Takahashi &lt;hiro.takahashi@eng.Sun.COM&gt;
+qsoft           3059/udp    # qsoft
+qsoft           3059/tcp    # qsoft
+#                          James Kunz &lt;jkunz@earlhaig.com&gt;
+interserver     3060/udp    # interserver
+interserver     3060/tcp    # interserver
+#                          Madhukar N. Thakur &lt;mthakur@interbase.com&gt;
+cautcpd         3061/udp    # cautcpd
+cautcpd         3061/tcp    # cautcpd
+ncacn-ip-tcp    3062/udp    # ncacn-ip-tcp
+ncacn-ip-tcp    3062/tcp    # ncacn-ip-tcp
 ncadg-ip-udp    3063/udp    # ncadg-ip-udp
-ncadg-ip-udp	3063/tcp    # ncadg-ip-udp
-#			   Gabi Kalmar &lt;kalga01@cai.com&gt;
+ncadg-ip-udp    3063/tcp    # ncadg-ip-udp
+#                          Gabi Kalmar &lt;kalga01@cai.com&gt;
 rprt            3064/udp    # Remote Port Redirector
 rprt            3064/tcp    # Remote Port Redirector
 #                          Robin Johnston &lt;robinj@learningtree.com&gt;
-slinterbase	3065/udp    # slinterbase
-slinterbase	3065/tcp    # slinterbase
-#			   Bie Tie &lt;stie@interbase.com&gt;
+slinterbase     3065/udp    # slinterbase
+slinterbase     3065/tcp    # slinterbase
+#                          Bie Tie &lt;stie@interbase.com&gt;
 netattachsdmp   3066/udp    # NETATTACHSDMP
 netattachsdmp   3066/tcp    # NETATTACHSDMP
 #                          Mike Young &lt;myong@netattach.com&gt;
 fjhpjp          3067/udp    # FJHPJP
 fjhpjp          3067/tcp    # FJHPJP
 #                          Ryozo Furutani &lt;furutani@np.lps.cs.fujitsu.co.jp&gt;
-ls3bcast	3068/udp    # ls3 Broadcast
-ls3bcast	3068/tcp    # ls3 Broadcast
-ls3		3069/udp    # ls3
-ls3		3069/tcp    # ls3
-#			   Andrei Tsyganenko &lt;atsyganenko@powerware.com&gt;
+ls3bcast        3068/udp    # ls3 Broadcast
+ls3bcast        3068/tcp    # ls3 Broadcast
+ls3             3069/udp    # ls3
+ls3             3069/tcp    # ls3
+#                          Andrei Tsyganenko &lt;atsyganenko@powerware.com&gt;
 mgxswitch       3070/udp    # MGXSWITCH
 mgxswitch       3070/tcp    # MGXSWITCH
 #                          George Walter &lt;george.walter@ascentialsoftware.com&gt;
 csd-mgmt-port   3071/udp    # ContinuStor Manager Port
-csd-mgmt-port	3071/tcp    # ContinuStor Manager Port
+csd-mgmt-port   3071/tcp    # ContinuStor Manager Port
 csd-monitor     3072/udp    # ContinuStor Monitor Port
 csd-monitor     3072/tcp    # ContinuStor Monitor Port
 #                          Ray Jantz &lt;ray.jantz@lsil.com&gt;
@@ -7360,17 +7360,17 @@ orbix-cfg-ssl   3078/tcp    # Orbix 2000 Locator SSL
 lv-frontpanel   3079/udp    # LV Front Panel
 lv-frontpanel   3079/tcp    # LV Front Panel
 #                          Darshan Shah &lt;darshan.shah@ni.com&gt;
-stm_pproc	3080/udp    # stm_pproc
-stm_pproc	3080/tcp    # stm_pproc
-#			   Paul McGinnis &lt;pmcginnis@server.stmi.com&gt;
-tl1-lv		3081/udp    # TL1-LV
-tl1-lv		3081/tcp    # TL1-LV
-tl1-raw		3082/udp    # TL1-RAW
-tl1-raw		3082/tcp    # TL1-RAW
-tl1-telnet	3083/udp    # TL1-TELNET
-tl1-telnet	3083/tcp    # TL1-TELNET
-#			   SONET Internetworking Forum (SIF)
-#			   &lt;bwarijsman@lucent.com&gt; - SONET Contact
+stm_pproc       3080/udp    # stm_pproc
+stm_pproc       3080/tcp    # stm_pproc
+#                          Paul McGinnis &lt;pmcginnis@server.stmi.com&gt;
+tl1-lv          3081/udp    # TL1-LV
+tl1-lv          3081/tcp    # TL1-LV
+tl1-raw         3082/udp    # TL1-RAW
+tl1-raw         3082/tcp    # TL1-RAW
+tl1-telnet      3083/udp    # TL1-TELNET
+tl1-telnet      3083/tcp    # TL1-TELNET
+#                          SONET Internetworking Forum (SIF)
+#                          &lt;bwarijsman@lucent.com&gt; - SONET Contact
 itm-mccs        3084/udp    # ITM-MCCS
 itm-mccs        3084/tcp    # ITM-MCCS
 #                          Alain Callebaut &lt;ac@itmasters.com&gt;
@@ -7381,7 +7381,7 @@ jdl-dbkitchen   3086/udp    # JDL-DBKitchen
 jdl-dbkitchen   3086/tcp    # JDL-DBKitchen
 #                          Hideo Wakabayashi &lt;hiwaka@alles.or.jp&gt;
 asoki-sma       3087/udp    # Asoki SMA
-asoki-sma	3087/tcp    # Asoki SMA
+asoki-sma       3087/tcp    # Asoki SMA
 #                          Andrew Mossberg &lt;amossberg@asoki.net&gt;     
 xdtp            3088/udp    # eXtensible Data Transfer Protocol
 xdtp            3088/tcp    # eXtensible Data Transfer Protocol
@@ -7433,17 +7433,17 @@ autocuesmi      3103/tcp    # Autocue SMI Protocol
 autocuetime     3104/udp    # Autocue Time Service
 autocuelog      3104/tcp    # Autocue Logger Protocol
 #                          Geoff Back &lt;geoff@autocue.co.uk&gt;
-cardbox		3105/udp    # Cardbox
-cardbox		3105/tcp    # Cardbox
-cardbox-http	3106/udp    # Cardbox HTTP
-cardbox-http	3106/tcp    # Cardbox HTTP
-#			   Martin Kochanski &lt;martin@cardbox.co.uk&gt;
-business    	3107/udp    # Business protocol
-business    	3107/tcp    # Business protocol
-geolocate   	3108/udp    # Geolocate protocol
-geolocate   	3108/tcp    # Geolocate protocol
-personnel   	3109/udp    # Personnel protocol
-personnel   	3109/tcp    # Personnel protocol
+cardbox         3105/udp    # Cardbox
+cardbox         3105/tcp    # Cardbox
+cardbox-http    3106/udp    # Cardbox HTTP
+cardbox-http    3106/tcp    # Cardbox HTTP
+#                          Martin Kochanski &lt;martin@cardbox.co.uk&gt;
+business        3107/udp    # Business protocol
+business        3107/tcp    # Business protocol
+geolocate       3108/udp    # Geolocate protocol
+geolocate       3108/tcp    # Geolocate protocol
+personnel       3109/udp    # Personnel protocol
+personnel       3109/tcp    # Personnel protocol
 #                          William Randolph Royere III 
 #                          &lt;william@royere.net&gt;
 sim-control     3110/udp    # simulator control port
@@ -7504,12 +7504,12 @@ ndl-aas         3128/tcp    # Active API Server Port
 netport-id      3129/udp    # NetPort Discovery Port
 netport-id      3129/tcp    # NetPort Discovery Port
 #                          P.T.K. Farrar &lt;farrarp@teccon.co.uk&gt;
-icpv2		3130/udp    # ICPv2
-icpv2		3130/tcp    # ICPv2
-#			   Duane Wessels &lt;wessels@nlanr.net&gt;
-netbookmark	3131/udp    # Net Book Mark
-netbookmark	3131/tcp    # Net Book Mark
-#			   Yiftach Ravid &lt;yiftach@haifa.vnet.ibm.com&gt;
+icpv2           3130/udp    # ICPv2
+icpv2           3130/tcp    # ICPv2
+#                          Duane Wessels &lt;wessels@nlanr.net&gt;
+netbookmark     3131/udp    # Net Book Mark
+netbookmark     3131/tcp    # Net Book Mark
+#                          Yiftach Ravid &lt;yiftach@haifa.vnet.ibm.com&gt;
 ms-rule-engine  3132/udp    # Microsoft Business Rule Engine Update Service
 ms-rule-engine  3132/tcp    # Microsoft Business Rule Engine Update Service
 #                          Anush Kumar &lt;anushk@microsoft.com&gt;
@@ -7540,40 +7540,40 @@ ariliamulti     3140/tcp    # Arilia Multiplexor
 vmodem          3141/udp    # VMODEM
 vmodem          3141/tcp    # VMODEM
 #                          Ray Gwinn &lt;p00321@psilink.com&gt;
-rdc-wh-eos	3142/udp    # RDC WH EOS
-rdc-wh-eos	3142/tcp    # RDC WH EOS
-#			   Udi Nir &lt;udi_nir@ncc.co.il&gt;
-seaview		3143/udp    # Sea View
-seaview		3143/tcp    # Sea View
-#			   Jim Flaherty &lt;jim_e_flaherty@notes.seagate.com&gt;
-tarantella	3144/udp    # Tarantella
-tarantella	3144/tcp    # Tarantella
-#			   Roger Binns &lt;rogerb@sco.com&gt;
-csi-lfap	3145/udp    # CSI-LFAP
-csi-lfap	3145/tcp    # CSI-LFAP
-#			   Paul Amsden &lt;amsden@.ctron.com&gt;
+rdc-wh-eos      3142/udp    # RDC WH EOS
+rdc-wh-eos      3142/tcp    # RDC WH EOS
+#                          Udi Nir &lt;udi_nir@ncc.co.il&gt;
+seaview         3143/udp    # Sea View
+seaview         3143/tcp    # Sea View
+#                          Jim Flaherty &lt;jim_e_flaherty@notes.seagate.com&gt;
+tarantella      3144/udp    # Tarantella
+tarantella      3144/tcp    # Tarantella
+#                          Roger Binns &lt;rogerb@sco.com&gt;
+csi-lfap        3145/udp    # CSI-LFAP
+csi-lfap        3145/tcp    # CSI-LFAP
+#                          Paul Amsden &lt;amsden@.ctron.com&gt;
 bears-02        3146/udp    # bears-02
 bears-02        3146/tcp    # bears-02
 #                          Bruce McKinnon &lt;brucemck@bearsolutions.com.au&gt;
-rfio		3147/udp    # RFIO
-rfio		3147/tcp    # RFIO
-#			   Frederic Hemmer &lt;Frederic.Hemmer@cern.ch&gt;
-nm-game-admin	3148/udp    # NetMike Game Administrator
-nm-game-admin	3148/tcp    # NetMike Game Administrator
-nm-game-server	3149/udp    # NetMike Game Server
-nm-game-server	3149/tcp    # NetMike Game Server
-nm-asses-admin	3150/udp    # NetMike Assessor Administrator
-nm-asses-admin	3150/tcp    # NetMike Assessor Administrator
-nm-assessor	3151/udp    # NetMike Assessor
-nm-assessor	3151/tcp    # NetMike Assessor
-#			   Andrew Sharpe &lt;help@smartsims.com&gt;
+rfio            3147/udp    # RFIO
+rfio            3147/tcp    # RFIO
+#                          Frederic Hemmer &lt;Frederic.Hemmer@cern.ch&gt;
+nm-game-admin   3148/udp    # NetMike Game Administrator
+nm-game-admin   3148/tcp    # NetMike Game Administrator
+nm-game-server  3149/udp    # NetMike Game Server
+nm-game-server  3149/tcp    # NetMike Game Server
+nm-asses-admin  3150/udp    # NetMike Assessor Administrator
+nm-asses-admin  3150/tcp    # NetMike Assessor Administrator
+nm-assessor     3151/udp    # NetMike Assessor
+nm-assessor     3151/tcp    # NetMike Assessor
+#                          Andrew Sharpe &lt;help@smartsims.com&gt;
 feitianrockey   3152/udp    # FeiTian Port
 feitianrockey   3152/tcp    # FeiTian Port
 #                          Huang Yu &lt;llw@ftsafe.com&gt;
 s8-client-port  3153/udp    # S8Cargo Client Port
 s8-client-port  3153/tcp    # S8Cargo Client Port
 #                          Jon S. Kyle &lt;JKyle@SpeedwaySoftware.com&gt;
-ccmrmi		3154/udp    # ON RMI Registry
+ccmrmi          3154/udp    # ON RMI Registry
 ccmrmi          3154/tcp    # ON RMI Registry
 #                          Ram Sudama &lt;rsudama@on.com&gt;
 jpegmpeg        3155/udp    # JpegMpeg Port
@@ -7601,10 +7601,10 @@ sflm            3162/udp    # SFLM
 sflm            3162/tcp    # SFLM
 #                          Keith Turner &lt;support@silvaco.com&gt;
 res-sap         3163/udp    # RES-SAP
-res-sap		3163/tcp    # RES-SAP
+res-sap         3163/tcp    # RES-SAP
 #                          Bob Janssen &lt;bob@res.nl&gt;
 imprs           3164/udp    # IMPRS
-imprs		3164/tcp    # IMPRS
+imprs           3164/tcp    # IMPRS
 #                          Lars Bohn &lt;Lars.Bohn@nokia.com&gt;
 newgenpay       3165/udp    # Newgenpay Engine Service
 newgenpay       3165/tcp    # Newgenpay Engine Service
@@ -7618,7 +7618,7 @@ poweronnud      3168/udp    # poweronnud
 poweronnud      3168/tcp    # poweronnud
 #                          Paul Cone &lt;paul@poweronsoftware.com&gt;
 serverview-as   3169/udp    # SERVERVIEW-AS
-serverview-as	3169/tcp    # SERVERVIEW-AS
+serverview-as   3169/tcp    # SERVERVIEW-AS
 serverview-asn  3170/udp    # SERVERVIEW-ASN
 serverview-asn  3170/tcp    # SERVERVIEW-ASN
 serverview-gf   3171/udp    # SERVERVIEW-GF
@@ -7647,14 +7647,14 @@ radclientport   3178/tcp    # Radiance UltraEdge Port
 h2gf-w-2m       3179/udp    # H2GF W.2m Handover prot.
 h2gf-w-2m       3179/tcp    # H2GF W.2m Handover prot.
 #                          Arne Norefors &lt;Arne.Norefors@ericsson.com&gt;
-mc-brk-srv	3180/udp    # Millicent Broker Server
-mc-brk-srv	3180/tcp    # Millicent Broker Server
-#			   Steve Glassman &lt;steveg@pa.dec.com&gt;
+mc-brk-srv      3180/udp    # Millicent Broker Server
+mc-brk-srv      3180/tcp    # Millicent Broker Server
+#                          Steve Glassman &lt;steveg@pa.dec.com&gt;
 bmcpatrolagent  3181/udp    # BMC Patrol Agent
-bmcpatrolagent	3181/tcp    # BMC Patrol Agent
+bmcpatrolagent  3181/tcp    # BMC Patrol Agent
 bmcpatrolrnvu   3182/udp    # BMC Patrol Rendezvous
-bmcpatrolrnvu	3182/tcp    # BMC Patrol Rendezvous
-#			   Eric Anderson &lt;eric_anderson@bmc.com&gt;
+bmcpatrolrnvu   3182/tcp    # BMC Patrol Rendezvous
+#                          Eric Anderson &lt;eric_anderson@bmc.com&gt;
 cops-tls        3183/udp    # COPS/TLS
 cops-tls        3183/tcp    # COPS/TLS
 #                          Mark Stevens &lt;mstevens@ellacoya.com&gt;
@@ -7924,108 +7924,108 @@ ordinox-server  3274/tcp    # Ordinox Server
 samd            3275/udp    # SAMD
 samd            3275/tcp    # SAMD
 #                          Edgar Circenis &lt;ec@fc.hp.com&gt;
-maxim-asics	3276/udp    # Maxim ASICs
-maxim-asics	3276/tcp    # Maxim ASICs
-#			   Dave Inman &lt;davei@mxim.com&gt;
-awg-proxy	3277/udp    # AWG Proxy
-awg-proxy	3277/tcp    # AWG Proxy
-#			   Alex McDonald &lt;alexm@an.hp.com&gt;
-lkcmserver	3278/udp    # LKCM Server
-lkcmserver	3278/tcp    # LKCM Server
-#			   Javier Jimenez
-admind		3279/udp    # admind
-admind		3279/tcp    # admind
-#			   Jeff Haynes &lt;haynes@chistech.com&gt;
-vs-server	3280/udp    # VS Server
-vs-server	3280/tcp    # VS Server
-#			   Scott Godlew &lt;Scott@godlew.com&gt;
-sysopt 		3281/udp    # SYSOPT
-sysopt		3281/tcp    # SYSOPT
-#			   Tony Hoffman &lt;ajh@unx.dec.com&gt;
-datusorb	3282/udp    # Datusorb
-datusorb	3282/tcp    # Datusorb
-#			   Thomas Martin &lt;thomas@datus-usa.com&gt;
-net-assistant	3283/udp    # Net Assistant
-net-assistant	3283/tcp    # Net Assistant
-#			   Michael Stein &lt;mvs@apple.com&gt;
-4talk		3284/udp    # 4Talk
-4talk		3284/tcp    # 4Talk
-#			   Tony Bushnell &lt;tony_bushnell@four-sight.co.uk&gt;
-plato		3285/udp    # Plato
-plato		3285/tcp    # Plato
-#			   Jim Battin &lt;battin@tro.com&gt;
-e-net		3286/udp    # E-Net
-e-net		3286/tcp    # E-Net
-#			   Steven Grigsby &lt;sgrigsby@austin.eent.com&gt;
-directvdata	3287/udp    # DIRECTVDATA
-directvdata	3287/tcp    # DIRECTVDATA
-#			   Michael Friedman &lt;mfr1@worldnet.att.net&gt;
-cops 		3288/udp    # COPS
-cops		3288/tcp    # COPS
-#			   Shai Herzog &lt;herzog@iphighway.com&gt;
-enpc		3289/udp    # ENPC
-enpc		3289/tcp    # ENPC
-#			   SEIKO EPSON &lt;Ishida.Hitoshi@exc.epson.co.jp&gt;
-caps-lm		3290/udp    # CAPS LOGISTICS TOOLKIT - LM
-caps-lm		3290/tcp    # CAPS LOGISTICS TOOLKIT - LM
-#			   Joseph Krebs &lt;joek@caps.com&gt;
-sah-lm		3291/udp    # S A Holditch &amp; Associates - LM
-sah-lm		3291/tcp    # S A Holditch &amp; Associates - LM
-#			   Randy Hudgens &lt;rhh@nmail.holditch.com&gt;
-cart-o-rama	3292/udp    # Cart O Rama
-cart-o-rama	3292/tcp    # Cart O Rama
-#			   Phillip Dillinger &lt;Phillip.Dillinger@sealabs.com&gt;
-fg-fps		3293/udp    # fg-fps
-fg-fps		3293/tcp    # fg-fps
-fg-gip		3294/udp    # fg-gip
-fg-gip		3294/tcp    # fg-gip
-#			   Jean-Marc Frailong &lt;jmf@freegate.net&gt;
-dyniplookup	3295/udp    # Dynamic IP Lookup
-dyniplookup	3295/tcp    # Dynamic IP Lookup
-#			   Eugene Osovetsky &lt;eugeneo@geocities.com&gt;
-rib-slm		3296/udp    # Rib License Manager
-rib-slm		3296/tcp    # Rib License Manager
-#			   Kristean Heisler &lt;kh@rib.de&gt;
-cytel-lm	3297/udp    # Cytel License Manager
-cytel-lm	3297/tcp    # Cytel License Manager
-#			   Yogesh P. Gajjar &lt;yogesh@cytel.com&gt;
+maxim-asics     3276/udp    # Maxim ASICs
+maxim-asics     3276/tcp    # Maxim ASICs
+#                          Dave Inman &lt;davei@mxim.com&gt;
+awg-proxy       3277/udp    # AWG Proxy
+awg-proxy       3277/tcp    # AWG Proxy
+#                          Alex McDonald &lt;alexm@an.hp.com&gt;
+lkcmserver      3278/udp    # LKCM Server
+lkcmserver      3278/tcp    # LKCM Server
+#                          Javier Jimenez
+admind          3279/udp    # admind
+admind          3279/tcp    # admind
+#                          Jeff Haynes &lt;haynes@chistech.com&gt;
+vs-server       3280/udp    # VS Server
+vs-server       3280/tcp    # VS Server
+#                          Scott Godlew &lt;Scott@godlew.com&gt;
+sysopt          3281/udp    # SYSOPT
+sysopt          3281/tcp    # SYSOPT
+#                          Tony Hoffman &lt;ajh@unx.dec.com&gt;
+datusorb        3282/udp    # Datusorb
+datusorb        3282/tcp    # Datusorb
+#                          Thomas Martin &lt;thomas@datus-usa.com&gt;
+net-assistant   3283/udp    # Net Assistant
+net-assistant   3283/tcp    # Net Assistant
+#                          Michael Stein &lt;mvs@apple.com&gt;
+4talk           3284/udp    # 4Talk
+4talk           3284/tcp    # 4Talk
+#                          Tony Bushnell &lt;tony_bushnell@four-sight.co.uk&gt;
+plato           3285/udp    # Plato
+plato           3285/tcp    # Plato
+#                          Jim Battin &lt;battin@tro.com&gt;
+e-net           3286/udp    # E-Net
+e-net           3286/tcp    # E-Net
+#                          Steven Grigsby &lt;sgrigsby@austin.eent.com&gt;
+directvdata     3287/udp    # DIRECTVDATA
+directvdata     3287/tcp    # DIRECTVDATA
+#                          Michael Friedman &lt;mfr1@worldnet.att.net&gt;
+cops            3288/udp    # COPS
+cops            3288/tcp    # COPS
+#                          Shai Herzog &lt;herzog@iphighway.com&gt;
+enpc            3289/udp    # ENPC
+enpc            3289/tcp    # ENPC
+#                          SEIKO EPSON &lt;Ishida.Hitoshi@exc.epson.co.jp&gt;
+caps-lm         3290/udp    # CAPS LOGISTICS TOOLKIT - LM
+caps-lm         3290/tcp    # CAPS LOGISTICS TOOLKIT - LM
+#                          Joseph Krebs &lt;joek@caps.com&gt;
+sah-lm          3291/udp    # S A Holditch &amp; Associates - LM
+sah-lm          3291/tcp    # S A Holditch &amp; Associates - LM
+#                          Randy Hudgens &lt;rhh@nmail.holditch.com&gt;
+cart-o-rama     3292/udp    # Cart O Rama
+cart-o-rama     3292/tcp    # Cart O Rama
+#                          Phillip Dillinger &lt;Phillip.Dillinger@sealabs.com&gt;
+fg-fps          3293/udp    # fg-fps
+fg-fps          3293/tcp    # fg-fps
+fg-gip          3294/udp    # fg-gip
+fg-gip          3294/tcp    # fg-gip
+#                          Jean-Marc Frailong &lt;jmf@freegate.net&gt;
+dyniplookup     3295/udp    # Dynamic IP Lookup
+dyniplookup     3295/tcp    # Dynamic IP Lookup
+#                          Eugene Osovetsky &lt;eugeneo@geocities.com&gt;
+rib-slm         3296/udp    # Rib License Manager
+rib-slm         3296/tcp    # Rib License Manager
+#                          Kristean Heisler &lt;kh@rib.de&gt;
+cytel-lm        3297/udp    # Cytel License Manager
+cytel-lm        3297/tcp    # Cytel License Manager
+#                          Yogesh P. Gajjar &lt;yogesh@cytel.com&gt;
 deskview        3298/udp    # DeskView
 deskview        3298/tcp    # DeskView
 #                          Manfred Randelzofer 
 #                          &lt;manfred.randelzofer@fujitsu-siemens.com&gt;
-pdrncs		3299/udp    # pdrncs
-pdrncs		3299/tcp    # pdrncs
-#			   Paul Wissenbach &lt;paulwi@vnd.tek.com&gt;
-###########	3300-3301  Unauthorized Use by SAP R/3   ######
-mcs-fastmail	3302/udp    # MCS Fastmail
-mcs-fastmail	3302/tcp    # MCS Fastmail
-#			   Patti Jo Newsom &lt;pjn@mcsdallas.com&gt;
+pdrncs          3299/udp    # pdrncs
+pdrncs          3299/tcp    # pdrncs
+#                          Paul Wissenbach &lt;paulwi@vnd.tek.com&gt;
+###########     3300-3301  Unauthorized Use by SAP R/3   ######
+mcs-fastmail    3302/udp    # MCS Fastmail
+mcs-fastmail    3302/tcp    # MCS Fastmail
+#                          Patti Jo Newsom &lt;pjn@mcsdallas.com&gt;
 opsession-clnt  3303/udp    # OP Session Client
-opsession-clnt	3303/tcp    # OP Session Client
+opsession-clnt  3303/tcp    # OP Session Client
 opsession-srvr  3304/udp    # OP Session Server
 opsession-srvr  3304/tcp    # OP Session Server
-#			   Amir Blich &lt;amir@netmanage.co.il&gt;
-odette-ftp	3305/udp    # ODETTE-FTP
-odette-ftp	3305/tcp    # ODETTE-FTP
-#			   David Nash &lt;dnash@ford.com&gt;
-mysql		3306/udp    # MySQL
-mysql		3306/tcp    # MySQL
-#			   Monty &lt;monty@analytikerna.se&gt;
-opsession-prxy	3307/udp    # OP Session Proxy
-opsession-prxy	3307/tcp    # OP Session Proxy
-#			   Amir Blich &lt;amir@netmanage.co.il&gt;
-tns-server	3308/udp    # TNS Server
-tns-server	3308/tcp    # TNS Server
-tns-adv		3309/udp    # TNS ADV
-tns-adv		3309/tcp    # TNS ADV
-#			   Jerome Albin &lt;albin@taec.enet.dec.com&gt;
-dyna-access	3310/udp    # Dyna Access
-dyna-access	3310/tcp    # Dyna Access
-#			   Dave Belliveau
-#			   &lt;DaveBelliveau@cornerstonesoftware.com&gt;
-mcns-tel-ret	3311/udp    # MCNS Tel Ret
-mcns-tel-ret	3311/tcp    # MCNS Tel Ret
-#			   Randall Atkinson &lt;rja@home.net&gt;
+#                          Amir Blich &lt;amir@netmanage.co.il&gt;
+odette-ftp      3305/udp    # ODETTE-FTP
+odette-ftp      3305/tcp    # ODETTE-FTP
+#                          David Nash &lt;dnash@ford.com&gt;
+mysql           3306/udp    # MySQL
+mysql           3306/tcp    # MySQL
+#                          Monty &lt;monty@analytikerna.se&gt;
+opsession-prxy  3307/udp    # OP Session Proxy
+opsession-prxy  3307/tcp    # OP Session Proxy
+#                          Amir Blich &lt;amir@netmanage.co.il&gt;
+tns-server      3308/udp    # TNS Server
+tns-server      3308/tcp    # TNS Server
+tns-adv         3309/udp    # TNS ADV
+tns-adv         3309/tcp    # TNS ADV
+#                          Jerome Albin &lt;albin@taec.enet.dec.com&gt;
+dyna-access     3310/udp    # Dyna Access
+dyna-access     3310/tcp    # Dyna Access
+#                          Dave Belliveau
+#                          &lt;DaveBelliveau@cornerstonesoftware.com&gt;
+mcns-tel-ret    3311/udp    # MCNS Tel Ret
+mcns-tel-ret    3311/tcp    # MCNS Tel Ret
+#                          Randall Atkinson &lt;rja@home.net&gt;
 appman-server   3312/udp    # Application Management Server
 appman-server   3312/tcp    # Application Management Server
 uorb            3313/udp    # Unify Object Broker
@@ -8033,225 +8033,225 @@ uorb            3313/tcp    # Unify Object Broker
 uohost          3314/udp    # Unify Object Host
 uohost          3314/tcp    # Unify Object Host
 #                          Duane Gibson &lt;ianaportmaster@unify.com&gt;
-cdid		3315/udp    # CDID
-cdid		3315/tcp    # CDID
-#			   Andrew Borisov &lt;hdr@chat.ru&gt;
-aicc-cmi	3316/udp    # AICC/CMI
-aicc-cmi	3316/tcp    # AICC/CMI
-#			   William McDonald &lt;billmc@atc.boeing.com&gt;
-vsaiport	3317/udp    # VSAI PORT
-vsaiport	3317/tcp    # VSAI PORT
-#			   Rieko Asai &lt;asai@isl.mei.co.jp&gt;
-ssrip		3318/udp    # Swith to Swith Routing Information Protocol
-ssrip		3318/tcp    # Swith to Swith Routing Information Protocol
-#			   Baba Hidekazu &lt;baba@flare.nd.net.fujitsu.co.jp&gt;
-sdt-lmd		3319/udp    # SDT License Manager
-sdt-lmd		3319/tcp    # SDT License Manager
-#			   Salvo Nassisi &lt;sdtech@tin.it&gt;
-officelink2000	3320/udp    # Office Link 2000
-officelink2000	3320/tcp    # Office Link 2000
-#			   Mike Balch &lt;mbalch@teltone.com&gt;
-vnsstr		3321/udp    # VNSSTR
-vnsstr		3321/tcp    # VNSSTR
-#			   Takeshi Ohmura &lt;ohmura@isl.mei.co.jp&gt;
-#			   Bob Braden &lt;braden@isi.edu&gt;
-sftu		3326/udp    # SFTU
-sftu		3326/tcp    # SFTU
-#		   Eduardo Rosenberg de Moura &lt;eduardor@spacenet.com.br&gt;
-bbars		3327/udp    # BBARS
-bbars		3327/tcp    # BBARS
-#			   Lou Harris &lt;lharris@outlx.bandl.com&gt;
-egptlm		3328/udp    # Eaglepoint License Manager
-egptlm		3328/tcp    # Eaglepoint License Manager
-#			   Dave Benton &lt;dave.benton@eaglepoint.com&gt;
+cdid            3315/udp    # CDID
+cdid            3315/tcp    # CDID
+#                          Andrew Borisov &lt;hdr@chat.ru&gt;
+aicc-cmi        3316/udp    # AICC/CMI
+aicc-cmi        3316/tcp    # AICC/CMI
+#                          William McDonald &lt;billmc@atc.boeing.com&gt;
+vsaiport        3317/udp    # VSAI PORT
+vsaiport        3317/tcp    # VSAI PORT
+#                          Rieko Asai &lt;asai@isl.mei.co.jp&gt;
+ssrip           3318/udp    # Swith to Swith Routing Information Protocol
+ssrip           3318/tcp    # Swith to Swith Routing Information Protocol
+#                          Baba Hidekazu &lt;baba@flare.nd.net.fujitsu.co.jp&gt;
+sdt-lmd         3319/udp    # SDT License Manager
+sdt-lmd         3319/tcp    # SDT License Manager
+#                          Salvo Nassisi &lt;sdtech@tin.it&gt;
+officelink2000  3320/udp    # Office Link 2000
+officelink2000  3320/tcp    # Office Link 2000
+#                          Mike Balch &lt;mbalch@teltone.com&gt;
+vnsstr          3321/udp    # VNSSTR
+vnsstr          3321/tcp    # VNSSTR
+#                          Takeshi Ohmura &lt;ohmura@isl.mei.co.jp&gt;
+#                          Bob Braden &lt;braden@isi.edu&gt;
+sftu            3326/udp    # SFTU
+sftu            3326/tcp    # SFTU
+#                  Eduardo Rosenberg de Moura &lt;eduardor@spacenet.com.br&gt;
+bbars           3327/udp    # BBARS
+bbars           3327/tcp    # BBARS
+#                          Lou Harris &lt;lharris@outlx.bandl.com&gt;
+egptlm          3328/udp    # Eaglepoint License Manager
+egptlm          3328/tcp    # Eaglepoint License Manager
+#                          Dave Benton &lt;dave.benton@eaglepoint.com&gt;
 hp-device-disc  3329/udp    # HP Device Disc
 hp-device-disc  3329/tcp    # HP Device Disc
-#			   Shivaun Albright &lt;shivaun_albright@hp.com&gt;
+#                          Shivaun Albright &lt;shivaun_albright@hp.com&gt;
 mcs-calypsoicf  3330/udp    # MCS Calypso ICF
 mcs-calypsoicf  3330/tcp    # MCS Calypso ICF
-mcs-messaging	3331/udp    # MCS Messaging
-mcs-messaging	3331/tcp    # MCS Messaging
-mcs-mailsvr	3332/udp    # MCS Mail Server
-mcs-mailsvr	3332/tcp    # MCS Mail Server
-#			   Patti Jo Newsom &lt;pjn@mcsdallas.com&gt;
+mcs-messaging   3331/udp    # MCS Messaging
+mcs-messaging   3331/tcp    # MCS Messaging
+mcs-mailsvr     3332/udp    # MCS Mail Server
+mcs-mailsvr     3332/tcp    # MCS Mail Server
+#                          Patti Jo Newsom &lt;pjn@mcsdallas.com&gt;
 dec-notes       3333/udp    # DEC Notes
 dec-notes       3333/tcp    # DEC Notes
 #                          Kim Moraros &lt;moraros@via.enet.dec.com&gt;
-directv-web	3334/udp    # Direct TV Webcasting
-directv-web	3334/tcp    # Direct TV Webcasting
-directv-soft	3335/udp    # Direct TV Software Updates
-directv-soft	3335/tcp    # Direct TV Software Updates
-directv-tick	3336/udp    # Direct TV Tickers
-directv-tick	3336/tcp    # Direct TV Tickers
-directv-catlg	3337/udp    # Direct TV Data Catalog
-directv-catlg	3337/tcp    # Direct TV Data Catalog
-#			   Michael Friedman &lt;mfr1@worldnet.att.net&gt;
-anet-b		3338/udp    # OMF data b
-anet-b		3338/tcp    # OMF data b
-anet-l		3339/udp    # OMF data l
-anet-l		3339/tcp    # OMF data l
-anet-m		3340/udp    # OMF data m
-anet-m		3340/tcp    # OMF data m
-anet-h		3341/udp    # OMF data h
-anet-h		3341/tcp    # OMF data h
-#			   Per Sahlqvist &lt;psahlqvi@sw.seisy.abb.se&gt;
-webtie		3342/udp    # WebTIE
-webtie		3342/tcp    # WebTIE
-#			   Kevin Frender &lt;kbf@ngdc.noaa.gov&gt;
-ms-cluster-net	3343/udp    # MS Cluster Net
-ms-cluster-net	3343/tcp    # MS Cluster Net
-#			   Mike Massa &lt;mikemas@microsoft.com&gt;
+directv-web     3334/udp    # Direct TV Webcasting
+directv-web     3334/tcp    # Direct TV Webcasting
+directv-soft    3335/udp    # Direct TV Software Updates
+directv-soft    3335/tcp    # Direct TV Software Updates
+directv-tick    3336/udp    # Direct TV Tickers
+directv-tick    3336/tcp    # Direct TV Tickers
+directv-catlg   3337/udp    # Direct TV Data Catalog
+directv-catlg   3337/tcp    # Direct TV Data Catalog
+#                          Michael Friedman &lt;mfr1@worldnet.att.net&gt;
+anet-b          3338/udp    # OMF data b
+anet-b          3338/tcp    # OMF data b
+anet-l          3339/udp    # OMF data l
+anet-l          3339/tcp    # OMF data l
+anet-m          3340/udp    # OMF data m
+anet-m          3340/tcp    # OMF data m
+anet-h          3341/udp    # OMF data h
+anet-h          3341/tcp    # OMF data h
+#                          Per Sahlqvist &lt;psahlqvi@sw.seisy.abb.se&gt;
+webtie          3342/udp    # WebTIE
+webtie          3342/tcp    # WebTIE
+#                          Kevin Frender &lt;kbf@ngdc.noaa.gov&gt;
+ms-cluster-net  3343/udp    # MS Cluster Net
+ms-cluster-net  3343/tcp    # MS Cluster Net
+#                          Mike Massa &lt;mikemas@microsoft.com&gt;
 bnt-manager     3344/udp    # BNT Manager
 bnt-manager     3344/tcp    # BNT Manager
 #                          Brian J. Ives &lt;Brian.Ives@BadgerNT.com&gt;
-influence	3345/udp    # Influence
-influence	3345/tcp    # Influence
-#			   Russ Ferriday &lt;russf@topia.com&gt;
+influence       3345/udp    # Influence
+influence       3345/tcp    # Influence
+#                          Russ Ferriday &lt;russf@topia.com&gt;
 trnsprntproxy   3346/udp    # Trnsprnt Proxy
-trnsprntproxy	3346/tcp    # Trnsprnt Proxy
-#			   Grant Kirby &lt;grant_kirby@ccm.al.intel.com&gt;
-phoenix-rpc	3347/udp    # Phoenix RPC
-phoenix-rpc	3347/tcp    # Phoenix RPC
-#			   Ian Anderson &lt;ian_anderson@phoenix.com&gt;
-pangolin-laser	3348/udp    # Pangolin Laser
-pangolin-laser	3348/tcp    # Pangolin Laser
-#			   William Benner &lt;William_Benner@msn.com&gt;
+trnsprntproxy   3346/tcp    # Trnsprnt Proxy
+#                          Grant Kirby &lt;grant_kirby@ccm.al.intel.com&gt;
+phoenix-rpc     3347/udp    # Phoenix RPC
+phoenix-rpc     3347/tcp    # Phoenix RPC
+#                          Ian Anderson &lt;ian_anderson@phoenix.com&gt;
+pangolin-laser  3348/udp    # Pangolin Laser
+pangolin-laser  3348/tcp    # Pangolin Laser
+#                          William Benner &lt;William_Benner@msn.com&gt;
 chevinservices  3349/udp    # Chevin Services
-chevinservices	3349/tcp    # Chevin Services
-#			   Gus McNaughton &lt;gus@chevin.com&gt;
-findviatv	3350/udp    # FINDVIATV
-findviatv	3350/tcp    # FINDVIATV
-#			   Oran Davis &lt;oran@8x8.com&gt;
+chevinservices  3349/tcp    # Chevin Services
+#                          Gus McNaughton &lt;gus@chevin.com&gt;
+findviatv       3350/udp    # FINDVIATV
+findviatv       3350/tcp    # FINDVIATV
+#                          Oran Davis &lt;oran@8x8.com&gt;
 btrieve         3351/udp    # Btrieve port
 btrieve         3351/tcp    # Btrieve port
 ssql            3352/udp    # Scalable SQL
 ssql            3352/tcp    # Scalable SQL
 #                          Chuck Talk &lt;ctalk@pervasive.com&gt;
-fatpipe		3353/udp    # FATPIPE
-fatpipe		3353/tcp    # FATPIPE
-#			   Sanchaita Datta &lt;sdatta@ragula.com&gt;
-suitjd		3354/udp    # SUITJD
-suitjd		3354/tcp    # SUITJD
-#			   Todd Moyer &lt;tsm@unx.dec.com&gt;
-ordinox-dbase	3355/udp    # Ordinox Dbase
-ordinox-dbase	3355/tcp    # Ordinox Dbase
-#			   Guy Litourneau &lt;gletourneau@ordinox.com&gt;
-upnotifyps	3356/udp    # UPNOTIFYPS
-upnotifyps	3356/tcp    # UPNOTIFYPS
-#			   Mark Fox &lt;markf@uplanet.com&gt;
-adtech-test	3357/udp    # Adtech Test IP
-adtech-test	3357/tcp    # Adtech Test IP
-#			   Robin Uyeshiro &lt;robin_u@adtech-inc.com&gt;
-mpsysrmsvr	3358/udp    # Mp Sys Rmsvr
-mpsysrmsvr	3358/tcp    # Mp Sys Rmsvr
-#			   Hiroyuki Kawabuchi &lt;buchi@ael.fujitsu.co.jp&gt;   
-wg-netforce	3359/udp    # WG NetForce
-wg-netforce	3359/tcp    # WG NetForce
-#			   Lee Wheat &lt;wheat@wg.com&gt;
-kv-server	3360/udp    # KV Server
-kv-server	3360/tcp    # KV Server
-kv-agent	3361/udp    # KV Agent
-kv-agent	3361/tcp    # KV Agent 
-#			   Thomas Soranno &lt;tom_soranno@cipartners.com&gt;
-dj-ilm		3362/udp    # DJ ILM
-dj-ilm		3362/tcp    # DJ ILM
-#			   Don Tyson
-nati-vi-server	3363/udp    # NATI Vi Server
-nati-vi-server	3363/tcp    # NATI Vi Server
-#			   Robert Dye &lt;rob@natinst.com&gt;
-creativeserver	3364/udp    # Creative Server
-creativeserver	3364/tcp    # Creative Server
-contentserver	3365/udp    # Content Server
-contentserver	3365/tcp    # Content Server
-creativepartnr	3366/udp    # Creative Partner
-creativepartnr	3366/tcp    # Creative Partner
-#			   Jesus Ortiz &lt;Jesus_A._Ortiz@notes.emotion.com&gt;
-#			   Scott Engel &lt;ScottX_Engel@ccm.jf.intel.com&gt;
-tip2		3372/udp    # TIP 2
-tip2		3372/tcp    # TIP 2
-#			   Keith Evans &lt;keith@loc252.tandem.com&gt;
-lavenir-lm	3373/udp    # Lavenir License Manager
-lavenir-lm	3373/tcp    # Lavenir License Manager
-#			   Marius Matioc &lt;marius@lavenir.com&gt;
-cluster-disc	3374/udp    # Cluster Disc
-cluster-disc	3374/tcp    # Cluster Disc
-#			   Jeff Hughes &lt;Jeff.Hughes@columbiasc.ncr.com&gt;
+fatpipe         3353/udp    # FATPIPE
+fatpipe         3353/tcp    # FATPIPE
+#                          Sanchaita Datta &lt;sdatta@ragula.com&gt;
+suitjd          3354/udp    # SUITJD
+suitjd          3354/tcp    # SUITJD
+#                          Todd Moyer &lt;tsm@unx.dec.com&gt;
+ordinox-dbase   3355/udp    # Ordinox Dbase
+ordinox-dbase   3355/tcp    # Ordinox Dbase
+#                          Guy Litourneau &lt;gletourneau@ordinox.com&gt;
+upnotifyps      3356/udp    # UPNOTIFYPS
+upnotifyps      3356/tcp    # UPNOTIFYPS
+#                          Mark Fox &lt;markf@uplanet.com&gt;
+adtech-test     3357/udp    # Adtech Test IP
+adtech-test     3357/tcp    # Adtech Test IP
+#                          Robin Uyeshiro &lt;robin_u@adtech-inc.com&gt;
+mpsysrmsvr      3358/udp    # Mp Sys Rmsvr
+mpsysrmsvr      3358/tcp    # Mp Sys Rmsvr
+#                          Hiroyuki Kawabuchi &lt;buchi@ael.fujitsu.co.jp&gt;
+wg-netforce     3359/udp    # WG NetForce
+wg-netforce     3359/tcp    # WG NetForce
+#                          Lee Wheat &lt;wheat@wg.com&gt;
+kv-server       3360/udp    # KV Server
+kv-server       3360/tcp    # KV Server
+kv-agent        3361/udp    # KV Agent
+kv-agent        3361/tcp    # KV Agent
+#                          Thomas Soranno &lt;tom_soranno@cipartners.com&gt;
+dj-ilm          3362/udp    # DJ ILM
+dj-ilm          3362/tcp    # DJ ILM
+#                          Don Tyson
+nati-vi-server  3363/udp    # NATI Vi Server
+nati-vi-server  3363/tcp    # NATI Vi Server
+#                          Robert Dye &lt;rob@natinst.com&gt;
+creativeserver  3364/udp    # Creative Server
+creativeserver  3364/tcp    # Creative Server
+contentserver   3365/udp    # Content Server
+contentserver   3365/tcp    # Content Server
+creativepartnr  3366/udp    # Creative Partner
+creativepartnr  3366/tcp    # Creative Partner
+#                          Jesus Ortiz &lt;Jesus_A._Ortiz@notes.emotion.com&gt;
+#                          Scott Engel &lt;ScottX_Engel@ccm.jf.intel.com&gt;
+tip2            3372/udp    # TIP 2
+tip2            3372/tcp    # TIP 2
+#                          Keith Evans &lt;keith@loc252.tandem.com&gt;
+lavenir-lm      3373/udp    # Lavenir License Manager
+lavenir-lm      3373/tcp    # Lavenir License Manager
+#                          Marius Matioc &lt;marius@lavenir.com&gt;
+cluster-disc    3374/udp    # Cluster Disc
+cluster-disc    3374/tcp    # Cluster Disc
+#                          Jeff Hughes &lt;Jeff.Hughes@columbiasc.ncr.com&gt;
 vsnm-agent      3375/udp    # VSNM Agent
-vsnm-agent	3375/tcp    # VSNM Agent
-#			   Venkat Rangan &lt;venkatr@vitalsigns.com&gt;
-cdbroker	3376/udp    # CD Broker
-cdbroker	3376/tcp    # CD Broker
-#			   Moon Ho Chung &lt;mchung@esps.com&gt;
-cogsys-lm	3377/udp    # Cogsys Network License Manager
-cogsys-lm	3377/tcp    # Cogsys Network License Manager
-#			   Simon Chinnick &lt;support@cogsys.co.uk&gt;
-wsicopy		3378/udp    # WSICOPY
-wsicopy		3378/tcp    # WSICOPY
-#			   James Overby
-socorfs		3379/udp    # SOCORFS
-socorfs		3379/tcp    # SOCORFS
-#			   Hugo Charbonneau
-sns-channels	3380/udp    # SNS Channels
-sns-channels	3380/tcp    # SNS Channels
-#			   Shekar Pasumarthi &lt;shekarp@firstfloor.com&gt;
-geneous		3381/udp    # Geneous
-geneous		3381/tcp    # Geneous
-#			   Nick de Smith &lt;nick.desmith@histech.com&gt;
-fujitsu-neat	3382/udp    # Fujitsu Network Enhanced Antitheft function
-fujitsu-neat	3382/tcp    # Fujitsu Network Enhanced Antitheft function
-#			   Markku Viima &lt;markku.viima@team.icl.se&gt;
-esp-lm		3383/udp    # Enterprise Software Products License Manager
-esp-lm		3383/tcp    # Enterprise Software Products License Manager
-#			   George Rudy &lt;george@entsoft.com&gt;
-hp-clic 	3384/udp    # Hardware Management
-hp-clic		3384/tcp    # Cluster Management Services
-#			   Rajesh Srinivasaraghavan &lt;srajesh@cup.hp.com&gt;
-qnxnetman	3385/udp    # qnxnetman
-qnxnetman	3385/tcp    # qnxnetman
-#			   Michael Hunter &lt;mphunter@qnx.com&gt;
-gprs-sig	3386/udp    # GPRS SIG
-gprs-data	3386/tcp    # GPRS Data
-#			   Ansgar Bergmann &lt;Ansgar.Bergmann@etsi.fr&gt;
-backroomnet	3387/udp    # Back Room Net
-backroomnet	3387/tcp    # Back Room Net
-#			   Clayton Wilkinson &lt;cwilkinson@carreker.com&gt;
-cbserver	3388/udp    # CB Server
-cbserver	3388/tcp    # CB Server
-#			   Allen Wei &lt;Allen_Wei@arborsoft.com&gt;
-ms-wbt-server	3389/udp    # MS WBT Server
-ms-wbt-server	3389/tcp    # MS WBT Server
-#			   Ritu Bahl &lt;ritub@microsoft.com&gt;
-dsc		3390/udp    # Distributed Service Coordinator
-dsc		3390/tcp    # Distributed Service Coordinator
-#			   Chas Honton &lt;chas@secant.com&gt;
-savant		3391/udp    # SAVANT
-savant		3391/tcp    # SAVANT
-#			   Andy Bruce &lt;franklin_yah@yahoo.com&gt;
-efi-lm		3392/udp    # EFI License Management
-efi-lm		3392/tcp    # EFI License Management
-#			   Ross E. Greinke &lt;greinker@execpc.com&gt;
-d2k-tapestry1	3393/udp    # D2K Tapestry Client to Server
-d2k-tapestry1	3393/tcp    # D2K Tapestry Client to Server
-d2k-tapestry2	3394/udp    # D2K Tapestry Server to Server
-d2k-tapestry2	3394/tcp    # D2K Tapestry Server to Server
-#			   Eric Lan &lt;elan@d2k.com&gt;
-dyna-lm		3395/udp    # Dyna License Manager (Elam)
-dyna-lm		3395/tcp    # Dyna License Manager (Elam)
-#			   Anjana Iyer &lt;anjana@dyna.com&gt;
-printer_agent	3396/udp    # Printer Agent
-printer_agent	3396/tcp    # Printer Agent
-#			   Devon Taylor &lt;dtaylor@novell.com&gt;
-cloanto-lm	3397/udp    # Cloanto License Manager 
-cloanto-lm	3397/tcp    # Cloanto License Manager
-#		    	   Takeo Sato &lt;takeo_sato-iana@cloanto.com&gt;
-mercantile	3398/udp    # Mercantile
-mercantile	3398/tcp    # Mercantile
-#			   Erik Kragh Jensen &lt;kragh@inet.uni2.dk&gt;
-csms		3399/udp    # CSMS
-csms		3399/tcp    # CSMS
-csms2		3400/udp    # CSMS2
-csms2		3400/tcp    # CSMS2
-#			   Markus Michels &lt;mmi@cedros.com&gt;
+vsnm-agent      3375/tcp    # VSNM Agent
+#                          Venkat Rangan &lt;venkatr@vitalsigns.com&gt;
+cdbroker        3376/udp    # CD Broker
+cdbroker        3376/tcp    # CD Broker
+#                          Moon Ho Chung &lt;mchung@esps.com&gt;
+cogsys-lm       3377/udp    # Cogsys Network License Manager
+cogsys-lm       3377/tcp    # Cogsys Network License Manager
+#                          Simon Chinnick &lt;support@cogsys.co.uk&gt;
+wsicopy         3378/udp    # WSICOPY
+wsicopy         3378/tcp    # WSICOPY
+#                          James Overby
+socorfs         3379/udp    # SOCORFS
+socorfs         3379/tcp    # SOCORFS
+#                          Hugo Charbonneau
+sns-channels    3380/udp    # SNS Channels
+sns-channels    3380/tcp    # SNS Channels
+#                          Shekar Pasumarthi &lt;shekarp@firstfloor.com&gt;
+geneous         3381/udp    # Geneous
+geneous         3381/tcp    # Geneous
+#                          Nick de Smith &lt;nick.desmith@histech.com&gt;
+fujitsu-neat    3382/udp    # Fujitsu Network Enhanced Antitheft function
+fujitsu-neat    3382/tcp    # Fujitsu Network Enhanced Antitheft function
+#                          Markku Viima &lt;markku.viima@team.icl.se&gt;
+esp-lm          3383/udp    # Enterprise Software Products License Manager
+esp-lm          3383/tcp    # Enterprise Software Products License Manager
+#                          George Rudy &lt;george@entsoft.com&gt;
+hp-clic         3384/udp    # Hardware Management
+hp-clic         3384/tcp    # Cluster Management Services
+#                          Rajesh Srinivasaraghavan &lt;srajesh@cup.hp.com&gt;
+qnxnetman       3385/udp    # qnxnetman
+qnxnetman       3385/tcp    # qnxnetman
+#                          Michael Hunter &lt;mphunter@qnx.com&gt;
+gprs-sig        3386/udp    # GPRS SIG
+gprs-data       3386/tcp    # GPRS Data
+#                          Ansgar Bergmann &lt;Ansgar.Bergmann@etsi.fr&gt;
+backroomnet     3387/udp    # Back Room Net
+backroomnet     3387/tcp    # Back Room Net
+#                          Clayton Wilkinson &lt;cwilkinson@carreker.com&gt;
+cbserver        3388/udp    # CB Server
+cbserver        3388/tcp    # CB Server
+#                          Allen Wei &lt;Allen_Wei@arborsoft.com&gt;
+ms-wbt-server   3389/udp    # MS WBT Server
+ms-wbt-server   3389/tcp    # MS WBT Server
+#                          Ritu Bahl &lt;ritub@microsoft.com&gt;
+dsc             3390/udp    # Distributed Service Coordinator
+dsc             3390/tcp    # Distributed Service Coordinator
+#                          Chas Honton &lt;chas@secant.com&gt;
+savant          3391/udp    # SAVANT
+savant          3391/tcp    # SAVANT
+#                          Andy Bruce &lt;franklin_yah@yahoo.com&gt;
+efi-lm          3392/udp    # EFI License Management
+efi-lm          3392/tcp    # EFI License Management
+#                          Ross E. Greinke &lt;greinker@execpc.com&gt;
+d2k-tapestry1   3393/udp    # D2K Tapestry Client to Server
+d2k-tapestry1   3393/tcp    # D2K Tapestry Client to Server
+d2k-tapestry2   3394/udp    # D2K Tapestry Server to Server
+d2k-tapestry2   3394/tcp    # D2K Tapestry Server to Server
+#                          Eric Lan &lt;elan@d2k.com&gt;
+dyna-lm         3395/udp    # Dyna License Manager (Elam)
+dyna-lm         3395/tcp    # Dyna License Manager (Elam)
+#                          Anjana Iyer &lt;anjana@dyna.com&gt;
+printer_agent   3396/udp    # Printer Agent
+printer_agent   3396/tcp    # Printer Agent
+#                          Devon Taylor &lt;dtaylor@novell.com&gt;
+cloanto-lm      3397/udp    # Cloanto License Manager
+cloanto-lm      3397/tcp    # Cloanto License Manager
+#                          Takeo Sato &lt;takeo_sato-iana@cloanto.com&gt;
+mercantile      3398/udp    # Mercantile
+mercantile      3398/tcp    # Mercantile
+#                          Erik Kragh Jensen &lt;kragh@inet.uni2.dk&gt;
+csms            3399/udp    # CSMS
+csms            3399/tcp    # CSMS
+csms2           3400/udp    # CSMS2
+csms2           3400/tcp    # CSMS2
+#                          Markus Michels &lt;mmi@cedros.com&gt;
 filecast        3401/udp    # filecast
 filecast        3401/tcp    # filecast
 #                          Eden Sherry &lt;eden@pair.com&gt;
@@ -9324,7 +9324,7 @@ ispmmgr         3775/tcp    # ISPM Manager Port
 #               3776       Unassigned
 jibe-eb         3777/udp    # Jibe EdgeBurst
 jibe-eb         3777/tcp    # Jibe EdgeBurst
-#                          Chap Tippin &lt;chad.tippin@jibeinc.com&gt; June 2003						   
+#                          Chap Tippin &lt;chad.tippin@jibeinc.com&gt; June 2003
 c-h-it-port     3778/udp    # Cutler-Hammer IT Port
 c-h-it-port     3778/tcp    # Cutler-Hammer IT Port
 #                          Thomas Ruchti &lt;thomasmruchti@eaton.com&gt; June 2003
@@ -9383,63 +9383,63 @@ mapper-mapethd  3985/tcp    # MAPPER TCP/IP server
 mapper-ws_ethd  3986/udp    # MAPPER workstation server
 mapper-ws_ethd  3986/tcp    # MAPPER workstation server
 #                          John C. Horton &lt;jch@unirsvl.rsvl.unisys.com&gt;
-centerline	3987/udp    # Centerline
-centerline	3987/tcp    # Centerline
-#			   Mark Simpson &lt;simpson@centerline.com&gt;
-#		3988-3999  Unassigned
-terabase	4000/udp    # Terabase
-terabase	4000/tcp    # Terabase
-#			   Thor Olson &lt;Thor@terabase.com&gt;   
+centerline      3987/udp    # Centerline
+centerline      3987/tcp    # Centerline
+#                          Mark Simpson &lt;simpson@centerline.com&gt;
+#               3988-3999  Unassigned
+terabase        4000/udp    # Terabase
+terabase        4000/tcp    # Terabase
+#                          Thor Olson &lt;Thor@terabase.com&gt;
 ####### Potential Conflict of ports ################################
 ####### PORT 4000 also used by ICQ &lt;www.icq.com&gt; ################### 
-newoak		4001/udp    # NewOak
-newoak		4001/tcp    # NewOak
-#			   Jim Philippou &lt;jphilippou@newoak.com&gt;
-pxc-spvr-ft	4002/udp    # pxc-spvr-ft
-pxc-spvr-ft	4002/tcp    # pxc-spvr-ft
-pxc-splr-ft	4003/udp    # pxc-splr-ft
-pxc-splr-ft	4003/tcp    # pxc-splr-ft
-pxc-roid	4004/udp    # pxc-roid
-pxc-roid	4004/tcp    # pxc-roid
-pxc-pin		4005/udp    # pxc-pin
-pxc-pin		4005/tcp    # pxc-pin
-pxc-spvr	4006/udp    # pxc-spvr
-pxc-spvr	4006/tcp    # pxc-spvr
-pxc-splr	4007/udp    # pxc-splr
-pxc-splr	4007/tcp    # pxc-splr
-#			   Dave Nesbitt &lt;nesbitt@cp10.es.xerox.com&gt;
+newoak          4001/udp    # NewOak
+newoak          4001/tcp    # NewOak
+#                          Jim Philippou &lt;jphilippou@newoak.com&gt;
+pxc-spvr-ft     4002/udp    # pxc-spvr-ft
+pxc-spvr-ft     4002/tcp    # pxc-spvr-ft
+pxc-splr-ft     4003/udp    # pxc-splr-ft
+pxc-splr-ft     4003/tcp    # pxc-splr-ft
+pxc-roid        4004/udp    # pxc-roid
+pxc-roid        4004/tcp    # pxc-roid
+pxc-pin         4005/udp    # pxc-pin
+pxc-pin         4005/tcp    # pxc-pin
+pxc-spvr        4006/udp    # pxc-spvr
+pxc-spvr        4006/tcp    # pxc-spvr
+pxc-splr        4007/udp    # pxc-splr
+pxc-splr        4007/tcp    # pxc-splr
+#                          Dave Nesbitt &lt;nesbitt@cp10.es.xerox.com&gt;
 netcheque       4008/udp    # NetCheque accounting 
 netcheque       4008/tcp    # NetCheque accounting 
 #                          B. Clifford Neuman &lt;bcn@isi.edu&gt;
-chimera-hwm	4009/udp    # Chimera HWM
+chimera-hwm     4009/udp    # Chimera HWM
 chimera-hwm     4009/tcp    # Chimera HWM
-#			   Ken Anderson &lt;kanderso@kleber.ICS.UCI.EDU&gt;
-samsung-unidex	4010/udp    # Samsung Unidex
+#                          Ken Anderson &lt;kanderso@kleber.ICS.UCI.EDU&gt;
+samsung-unidex  4010/udp    # Samsung Unidex
 samsung-unidex  4010/tcp    # Samsung Unidex
-#			   Konstantin V. Vyaznikov &lt;kv@ssm6000.samsung.ru&gt;
-altserviceboot	4011/udp    # Alternate Service Boot
-altserviceboot	4011/tcp    # Alternate Service Boot
-#			   Eric Dittert &lt;Eric_Dittert@ccm.jf.intel.com&gt;
-pda-gate	4012/udp    # PDA Gate
-pda-gate	4012/tcp    # PDA Gate
-#			   Masakuni Okada &lt;masakuni@jp.ibm.com&gt;
-acl-manager	4013/udp    # ACL Manager
-acl-manager	4013/tcp    # ACL Manager
-#			   Toru Murai &lt;murai@saint.nm.fujitsu.co.jp&gt;
-taiclock	4014/udp    # TAICLOCK
-taiclock	4014/tcp    # TAICLOCK
-#			   Dan Bernstein &lt;djb@koobera.math.uic.edu&gt;
-talarian-mcast1	4015/udp    # Talarian Mcast
-talarian-mcast1	4015/tcp    # Talarian Mcast
-talarian-mcast2	4016/udp    # Talarian Mcast
-talarian-mcast2	4016/tcp    # Talarian Mcast
-talarian-mcast3	4017/udp    # Talarian Mcast
-talarian-mcast3	4017/tcp    # Talarian Mcast
-talarian-mcast4	4018/udp    # Talarian Mcast
-talarian-mcast4	4018/tcp    # Talarian Mcast
-talarian-mcast5	4019/udp    # Talarian Mcast
-talarian-mcast5	4019/tcp    # Talarian Mcast
-#			   Geoff Mendal &lt;mendal@talarian.com&gt;
+#                          Konstantin V. Vyaznikov &lt;kv@ssm6000.samsung.ru&gt;
+altserviceboot  4011/udp    # Alternate Service Boot
+altserviceboot  4011/tcp    # Alternate Service Boot
+#                          Eric Dittert &lt;Eric_Dittert@ccm.jf.intel.com&gt;
+pda-gate        4012/udp    # PDA Gate
+pda-gate        4012/tcp    # PDA Gate
+#                          Masakuni Okada &lt;masakuni@jp.ibm.com&gt;
+acl-manager     4013/udp    # ACL Manager
+acl-manager     4013/tcp    # ACL Manager
+#                          Toru Murai &lt;murai@saint.nm.fujitsu.co.jp&gt;
+taiclock        4014/udp    # TAICLOCK
+taiclock        4014/tcp    # TAICLOCK
+#                          Dan Bernstein &lt;djb@koobera.math.uic.edu&gt;
+talarian-mcast1 4015/udp    # Talarian Mcast
+talarian-mcast1 4015/tcp    # Talarian Mcast
+talarian-mcast2 4016/udp    # Talarian Mcast
+talarian-mcast2 4016/tcp    # Talarian Mcast
+talarian-mcast3 4017/udp    # Talarian Mcast
+talarian-mcast3 4017/tcp    # Talarian Mcast
+talarian-mcast4 4018/udp    # Talarian Mcast
+talarian-mcast4 4018/tcp    # Talarian Mcast
+talarian-mcast5 4019/udp    # Talarian Mcast
+talarian-mcast5 4019/tcp    # Talarian Mcast
+#                          Geoff Mendal &lt;mendal@talarian.com&gt;
 trap            4020/udp    # TRAP Port
 trap            4020/tcp    # TRAP Port
 #                          Jeffrey C. Byrd &lt;admin@vspacegroup.com&gt;
@@ -9501,19 +9501,19 @@ houston         4041/tcp    # Rocketeer-Houston
 ldxp            4042/udp    # LDXP
 ldxp            4042/tcp    # LDXP
 #                          Craig Calef &lt;craig@katmango.com&gt;    
-#		4043-4095  Unassigned
-bre 		4096/udp    # BRE (Bridge Relay Element)
-bre 		4096/tcp    # BRE (Bridge Relay Element)
-#			   Stephen Egbert &lt;egbert@ra.timeplex.com&gt;
-patrolview	4097/udp    # Patrol View
-patrolview	4097/tcp    # Patrol View
-#			   Vincent Chin &lt;vincent_chin@bmc.com&gt;
-drmsfsd		4098/udp    # drmsfsd
-drmsfsd		4098/tcp    # drmsfsd
-#			   Masao Iwai &lt;iwai@kel.fujitsu.co.jp&gt;
-dpcp		4099/udp    # DPCP
-dpcp		4099/tcp    # DPCP
-#			   John Croft &lt;john.croft@calista.demon.co.uk&gt;
+#               4043-4095  Unassigned
+bre             4096/udp    # BRE (Bridge Relay Element)
+bre             4096/tcp    # BRE (Bridge Relay Element)
+#                          Stephen Egbert &lt;egbert@ra.timeplex.com&gt;
+patrolview      4097/udp    # Patrol View
+patrolview      4097/tcp    # Patrol View
+#                          Vincent Chin &lt;vincent_chin@bmc.com&gt;
+drmsfsd         4098/udp    # drmsfsd
+drmsfsd         4098/tcp    # drmsfsd
+#                          Masao Iwai &lt;iwai@kel.fujitsu.co.jp&gt;
+dpcp            4099/udp    # DPCP
+dpcp            4099/tcp    # DPCP
+#                          John Croft &lt;john.croft@calista.demon.co.uk&gt;
 igo-incognito   4100/udp    # IGo Incognito Data Port
 igo-incognito   4100/tcp    # IGo Incognito Data Port
 #                          Paul Reddy &lt;support@igo-incognito.com&gt; February 2002
@@ -9556,50 +9556,50 @@ atlinks         4154/tcp    # atlinks device discovery
 #               4155-4159  Unassigned
 jini-discovery  4160/udp    # Jini Discovery
 jini-discovery  4160/tcp    # Jini Discovery
-#                          Mark Hodapp &lt;mark.hodapp@sun.com&gt;	
-#		4161-4198  Unassigned
+#                          Mark Hodapp &lt;mark.hodapp@sun.com&gt;
+#               4161-4198  Unassigned
 eims-admin      4199/udp    # EIMS ADMIN
 eims-admin      4199/tcp    # EIMS ADMIN
 #                          Glenn Anderson &lt;glenn@qualcomm.co.nz&gt; 
-#			   Mitra &lt;mitra@earth.path.net&gt;
-corelccam	4300/udp    # Corel CCam
-corelccam	4300/tcp    # Corel CCam
-#			   Jason Aiken &lt;jasona@corelcomputer.com&gt;
-#		4301-4320  Unassigned
+#                          Mitra &lt;mitra@earth.path.net&gt;
+corelccam       4300/udp    # Corel CCam
+corelccam       4300/tcp    # Corel CCam
+#                          Jason Aiken &lt;jasona@corelcomputer.com&gt;
+#               4301-4320  Unassigned
 rwhois          4321/udp    # Remote Who Is
 rwhois          4321/tcp    # Remote Who Is
 #                          Mark Kosters  &lt;markk@internic.net&gt;
 unicall         4343/udp    # UNICALL
 unicall         4343/tcp    # UNICALL
 #                          James Powell &lt;james@enghp.unidata.comp&gt;
-vinainstall	4344/udp    # VinaInstall
-vinainstall 	4344/tcp    # VinaInstall
-#			   Jay Slupesky &lt;js@vina-tech.com&gt;
+vinainstall     4344/udp    # VinaInstall
+vinainstall     4344/tcp    # VinaInstall
+#                          Jay Slupesky &lt;js@vina-tech.com&gt;
 m4-network-as   4345/udp    # Macro 4 Network AS
-m4-network-as	4345/tcp    # Macro 4 Network AS
-#			   Paul Wren &lt;Paul.Wren@macro4.com&gt;
-elanlm		4346/udp    # ELAN LM
-elanlm		4346/tcp    # ELAN LM
-#			   Paul Ballew &lt;ballew@projtech.com&gt;
-lansurveyor	4347/udp    # LAN Surveyor
-lansurveyor	4347/tcp    # LAN Surveyor
-#			   Michael Swan &lt;swan@neon.com&gt;
-itose		4348/udp    # ITOSE
-itose		4348/tcp    # ITOSE
-#			   Michael Haeuptle &lt;Michael_Haeuptle@hp.com&gt;
-fsportmap	4349/udp    # File System Port Map
-fsportmap	4349/tcp    # File System Port Map
-#			   Ron Minnich &lt;rminnich@sarnoff.com&gt;
-net-device	4350/udp    # Net Device
-net-device	4350/tcp    # Net Device
-#			   Glenn Peterson &lt;glennp@microsoft.com&gt;
-plcy-net-svcs	4351/udp    # PLCY Net Services
-plcy-net-svcs	4351/tcp    # PLCY Net Services
-#			   J.J. Ekstrom
-#		4352       Unassigned
-f5-iquery	4353/udp    # F5 iQuery 
-f5-iquery	4353/tcp    # F5 iQuery 
-#			   Tom Kee &lt;t.kee@f5.com&gt;
+m4-network-as   4345/tcp    # Macro 4 Network AS
+#                          Paul Wren &lt;Paul.Wren@macro4.com&gt;
+elanlm          4346/udp    # ELAN LM
+elanlm          4346/tcp    # ELAN LM
+#                          Paul Ballew &lt;ballew@projtech.com&gt;
+lansurveyor     4347/udp    # LAN Surveyor
+lansurveyor     4347/tcp    # LAN Surveyor
+#                          Michael Swan &lt;swan@neon.com&gt;
+itose           4348/udp    # ITOSE
+itose           4348/tcp    # ITOSE
+#                          Michael Haeuptle &lt;Michael_Haeuptle@hp.com&gt;
+fsportmap       4349/udp    # File System Port Map
+fsportmap       4349/tcp    # File System Port Map
+#                          Ron Minnich &lt;rminnich@sarnoff.com&gt;
+net-device      4350/udp    # Net Device
+net-device      4350/tcp    # Net Device
+#                          Glenn Peterson &lt;glennp@microsoft.com&gt;
+plcy-net-svcs   4351/udp    # PLCY Net Services
+plcy-net-svcs   4351/tcp    # PLCY Net Services
+#                          J.J. Ekstrom
+#               4352       Unassigned
+f5-iquery       4353/udp    # F5 iQuery
+f5-iquery       4353/tcp    # F5 iQuery
+#                          Tom Kee &lt;t.kee@f5.com&gt;
 qsnet-trans     4354/udp    # QSNet Transmitter
 qsnet-trans     4354/tcp    # QSNet Transmitter
 qsnet-workst    4355/udp    # QSNet Workstation
@@ -9611,13 +9611,13 @@ qsnet-cond      4357/tcp    # QSNet Conductor
 qsnet-nucl      4358/udp    # QSNet Nucleus
 qsnet-nucl      4358/tcp    # QSNet Nucleus
 #                          Neer Kleinman &lt;neer@qsr.co.il&gt;
-#		4359-4441  Unassigned
-saris		4442/udp    # Saris
-saris		4442/tcp    # Saris
-pharos		4443/udp    # Pharos
-pharos		4443/tcp    # Pharos
-#			   TeleConsult GmbH, 76275 Ettlingen, Germany
-#			   &lt;teleconsult@t-online.de&gt;	
+#               4359-4441  Unassigned
+saris           4442/udp    # Saris
+saris           4442/tcp    # Saris
+pharos          4443/udp    # Pharos
+pharos          4443/tcp    # Pharos
+#                          TeleConsult GmbH, 76275 Ettlingen, Germany
+#                          &lt;teleconsult@t-online.de&gt;
 krb524          4444/udp    # KRB524
 krb524          4444/tcp    # KRB524
 #                          B. Clifford Neuman &lt;bcn@isi.edu&gt;
@@ -9626,55 +9626,55 @@ krb524          4444/tcp    # KRB524
 nv-video        4444/udp    # NV Video default
 nv-video        4444/tcp    # NV Video default
 #                          Ron Frederick &lt;frederick@parc.xerox.com&gt;
-upnotifyp 	4445/udp    # UPNOTIFYP
-upnotifyp	4445/tcp    # UPNOTIFYP
-#			   Mark Fox &lt;markf@uplanet.com&gt;
-n1-fwp		4446/udp    # N1-FWP
-n1-fwp		4446/tcp    # N1-FWP
-n1-rmgmt	4447/udp    # N1-RMGMT
-n1-rmgmt	4447/tcp    # N1-RMGMT
-#			   Lori Tassin &lt;Ramsey@network-1.com&gt;
-asc-slmd	4448/udp    # ASC Licence Manager
-asc-slmd	4448/tcp    # ASC Licence Manager
-#			   Casper Stoel &lt;cbs@ascinc.com&gt;
+upnotifyp       4445/udp    # UPNOTIFYP
+upnotifyp       4445/tcp    # UPNOTIFYP
+#                          Mark Fox &lt;markf@uplanet.com&gt;
+n1-fwp          4446/udp    # N1-FWP
+n1-fwp          4446/tcp    # N1-FWP
+n1-rmgmt        4447/udp    # N1-RMGMT
+n1-rmgmt        4447/tcp    # N1-RMGMT
+#                          Lori Tassin &lt;Ramsey@network-1.com&gt;
+asc-slmd        4448/udp    # ASC Licence Manager
+asc-slmd        4448/tcp    # ASC Licence Manager
+#                          Casper Stoel &lt;cbs@ascinc.com&gt;
 privatewire     4449/udp    # PrivateWire
 privatewire     4449/tcp    # PrivateWire
-#			   Uri Resnitzky &lt;uri@arx.com&gt;
-camp		4450/udp    # Camp
-camp		4450/tcp    # Camp
+#                          Uri Resnitzky &lt;uri@arx.com&gt;
+camp            4450/udp    # Camp
+camp            4450/tcp    # Camp
 ctisystemmsg    4451/udp    # CTI System Msg
 ctisystemmsg    4451/tcp    # CTI System Msg
 ctiprogramload  4452/udp    # CTI Program Load
 ctiprogramload  4452/tcp    # CTI Program Load
-#			   Steven Cliff &lt;sbcliff@controltechnology.com&gt;
-nssalertmgr	4453/udp    # NSS Alert Manager
-nssalertmgr 	4453/tcp    # NSS Alert Manager
-nssagentmgr 	4454/udp    # NSS Agent Manager
-nssagentmgr	4454/tcp    # NSS Agent Manager
-#			   Jim Hill&lt;jhill@symantec.com&gt;
-prchat-user	4455/udp    # PR Chat User
-prchat-user	4455/tcp    # PR Chat User
-prchat-server	4456/udp    # PR Chat Server
-prchat-server	4456/tcp    # PR Chat Server
-prRegister	4457/udp    # PR Register
-prRegister	4457/tcp    # PR Register
-#			   Donny Gilor &lt;dgilor@pop01.ny.us.ibm.net&gt;
-#		4458-4499  Unassigned
+#                          Steven Cliff &lt;sbcliff@controltechnology.com&gt;
+nssalertmgr     4453/udp    # NSS Alert Manager
+nssalertmgr     4453/tcp    # NSS Alert Manager
+nssagentmgr     4454/udp    # NSS Agent Manager
+nssagentmgr     4454/tcp    # NSS Agent Manager
+#                          Jim Hill&lt;jhill@symantec.com&gt;
+prchat-user     4455/udp    # PR Chat User
+prchat-user     4455/tcp    # PR Chat User
+prchat-server   4456/udp    # PR Chat Server
+prchat-server   4456/tcp    # PR Chat Server
+prRegister      4457/udp    # PR Register
+prRegister      4457/tcp    # PR Register
+#                          Donny Gilor &lt;dgilor@pop01.ny.us.ibm.net&gt;
+#               4458-4499  Unassigned
 ipsec-msft      4500/udp    # Microsoft IPsec NAT-T
 ipsec-msft      4500/tcp    # Microsoft IPsec NAT-T
 #                          Christian Huitema &lt;Huitema@microsoft.com&gt; March 2002
 #               4501  De-registered (08 June 2001)
 #                          IANA &lt;iana@iana.org&gt;
 #               4502-4544  Unassigned
-worldscores	4545/udp    # WorldScores
-worldscores	4545/tcp    # WorldScores
+worldscores     4545/udp    # WorldScores
+worldscores     4545/tcp    # WorldScores
 #                          Steve Davis &lt;sdavis@optum-inc.com&gt;
 sf-lm           4546/udp    # SF License Manager (Sentinel)
 sf-lm           4546/tcp    # SF License Manager (Sentinel)
 #                          Thomas Koell &lt;info@sf.com&gt;
-lanner-lm	4547/udp    # Lanner License Manager
-lanner-lm	4547/tcp    # Lanner License Manager
-#			   Les Enstone &lt;lenstone@lanner.co.uk&gt;
+lanner-lm       4547/udp    # Lanner License Manager
+lanner-lm       4547/tcp    # Lanner License Manager
+#                          Les Enstone &lt;lenstone@lanner.co.uk&gt;
 #               4548-4554  Unassigned
 rsip            4555/udp    # RSIP Port
 rsip            4555/tcp    # RSIP Port
@@ -9768,10 +9768,10 @@ parallel        4989/udp    # Parallel for GAUSS (tm)
 parallel        4989/tcp    # Parallel for GAUSS (tm)
 #                          Matthew Ford &lt;Matthew.Ford@forward.com.au&gt; March 2003
 #               4990-4999  Unassigned
-commplex-main	5000/udp # 
-commplex-main	5000/tcp # 
-commplex-link	5001/udp # 
-commplex-link	5001/tcp # 
+commplex-main   5000/udp #
+commplex-main   5000/tcp #
+commplex-link   5001/udp #
+commplex-link   5001/tcp #
 rfe             5002/udp    # radio free ethernet
 rfe             5002/tcp    # radio free ethernet
 fmpro-internal  5003/udp    # FileMaker, Inc. - Proprietary name binding
@@ -9881,8 +9881,8 @@ ctsd            5137/udp    # MyCTS server port
 ctsd            5137/tcp    # MyCTS server port
 #                          Jilles Oldenbeuving &lt;ojilles@hotmail.com&gt; June 2002
 #               5138-5144  Unassigned
-rmonitor_secure	5145/udp    # RMONITOR SECURE
-rmonitor_secure	5145/tcp    # RMONITOR SECURE
+rmonitor_secure 5145/udp    # RMONITOR SECURE
+rmonitor_secure 5145/tcp    # RMONITOR SECURE
 #                          Kory Hamzeh &lt;kory@ascend.com&gt; 
 #               5146-5149  Unassigned
 atmp            5150/udp    # Ascend Tunnel Management Protocol
@@ -9917,7 +9917,7 @@ targus-getdata2 5202/udp    # TARGUS GetData 2
 targus-getdata2 5202/tcp    # TARGUS GetData 2
 targus-getdata3 5203/udp    # TARGUS GetData 3
 targus-getdata3 5203/tcp    # TARGUS GetData 3 
-#			   John Keaveney &lt;johnkeaveney@targusinfo.com&gt;
+#                          John Keaveney &lt;johnkeaveney@targusinfo.com&gt;
 #               5204-5221  Unassigned
 jabber-client   5222/udp    # Jabber Client Connection
 jabber-client   5222/tcp    # Jabber Client Connection
@@ -9929,8 +9929,8 @@ hp-status       5226/udp    # HP Status
 hp-status       5226/tcp    # HP Status
 #                          Brett Green &lt;Brett_Green@HP.Com&gt;
 #               5227-5235  Unassigned
-padl2sim	5236/udp # 
-padl2sim	5236/tcp # 
+padl2sim        5236/udp #
+padl2sim        5236/tcp #
 #               5237-5249  Unassigned
 igateway        5250/udp    # iGateway
 igateway        5250/tcp    # iGateway
@@ -9946,46 +9946,46 @@ jabber-server   5269/udp    # Jabber Server Connection
 jabber-server   5269/tcp    # Jabber Server Connection
 #                          David Waite &lt;mass@akuma.org&gt; February 2002
 #               5270-5271  Unassigned
-pk		5272/udp    # PK
-pk		5272/tcp    # PK
-#			   Patrick Kara &lt;Patrick@EBA.NET&gt;
+pk              5272/udp    # PK
+pk              5272/tcp    # PK
+#                          Patrick Kara &lt;Patrick@EBA.NET&gt;
 #               5273-5281  Unassigned
 transmit-port   5282/udp    # Marimba Transmitter Port
 transmit-port   5282/tcp    # Marimba Transmitter Port
 #                          Johan Eriksson &lt;johan@marimba.com&gt; April 2002
 #               5283-5299  Unassigned
-hacl-hb		5300/udp	 # # HA cluster heartbeat
-hacl-hb		5300/tcp         # # HA cluster heartbeat
-hacl-gs		5301/udp	 # # HA cluster general services
-hacl-gs		5301/tcp	 # # HA cluster general services
-hacl-cfg	5302/udp	 # # HA cluster configuration
-hacl-cfg	5302/tcp	 # # HA cluster configuration
-hacl-probe	5303/udp	 # # HA cluster probing
-hacl-probe	5303/tcp	 # # HA cluster probing
+hacl-hb         5300/udp         # # HA cluster heartbeat
+hacl-hb         5300/tcp         # # HA cluster heartbeat
+hacl-gs         5301/udp         # # HA cluster general services
+hacl-gs         5301/tcp         # # HA cluster general services
+hacl-cfg        5302/udp         # # HA cluster configuration
+hacl-cfg        5302/tcp         # # HA cluster configuration
+hacl-probe      5303/udp         # # HA cluster probing
+hacl-probe      5303/tcp         # # HA cluster probing
 hacl-local      5304/udp         # 
 hacl-local      5304/tcp         # # HA Cluster Commands
 hacl-test       5305/udp                             # 
 hacl-test       5305/tcp         # # HA Cluster Test                    
 #                               Eric Soderberg &lt;seric@hposl102.cup.hp&gt;
 #                               Edward Yim &lt;eyim@hpmfas4.cup.hp.com&gt;
-sun-mc-grp	5306/udp    # Sun MC Group
-sun-mc-grp	5306/tcp    # Sun MC Group
-#			   Michael DeMoney &lt;demoney@eng.sun.com&gt;
-sco-aip		5307/udp    # SCO AIP
-sco-aip		5307/tcp    # SCO AIP
-#			   Barrie Cooper &lt;barrie@sco.com&gt;
-cfengine	5308/udp    # CFengine
-cfengine 	5308/tcp    # CFengine
-#			   Mark Burgess &lt;mark.burgess@iu.hioslo.no&gt;
-jprinter  	5309/udp    # J Printer
-jprinter	5309/tcp    # J Printer
-#			   Ken Blackwell &lt;kenb@bristol.com&gt;
-outlaws		5310/udp    # Outlaws
-outlaws		5310/tcp    # Outlaws
-#			   Richard Fife &lt;richardf@lucasarts.com&gt;
-tmlogin		5311/udp    # TM Login
-tmlogin		5311/tcp    # TM Login
-#			   Eric Sharakan &lt;eric.sharakan@east.sun.com&gt;
+sun-mc-grp      5306/udp    # Sun MC Group
+sun-mc-grp      5306/tcp    # Sun MC Group
+#                          Michael DeMoney &lt;demoney@eng.sun.com&gt;
+sco-aip         5307/udp    # SCO AIP
+sco-aip         5307/tcp    # SCO AIP
+#                          Barrie Cooper &lt;barrie@sco.com&gt;
+cfengine        5308/udp    # CFengine
+cfengine        5308/tcp    # CFengine
+#                          Mark Burgess &lt;mark.burgess@iu.hioslo.no&gt;
+jprinter        5309/udp    # J Printer
+jprinter        5309/tcp    # J Printer
+#                          Ken Blackwell &lt;kenb@bristol.com&gt;
+outlaws         5310/udp    # Outlaws
+outlaws         5310/tcp    # Outlaws
+#                          Richard Fife &lt;richardf@lucasarts.com&gt;
+tmlogin         5311/udp    # TM Login
+tmlogin         5311/tcp    # TM Login
+#                          Eric Sharakan &lt;eric.sharakan@east.sun.com&gt;
 #               5312-5313  Unassigned
 opalis-rbt-ipc  5314/udp    # opalis-rbt-ipc
 opalis-rbt-ipc  5314/tcp    # opalis-rbt-ipc
@@ -9997,68 +9997,68 @@ hacl-poll       5315/tcp    # HA Cluster UDP Polling
 mdns            5353/udp    # Multicast DNS
 mdns            5353/tcp    # Multicast DNS
 #                          Stuart Cheshire &lt;cheshire@multicastdns.org&gt;
-#     		5354-5399  Unassigned
-excerpt		5400/udp    # Excerpt Search
-excerpt		5400/tcp    # Excerpt Search
-excerpts	5401/udp    # Excerpt Search Secure
-excerpts	5401/tcp    # Excerpt Search Secure
-#			   John Hinsdale &lt;hin@alma.com&gt;
-mftp		5402/udp    # MFTP
-mftp		5402/tcp    # MFTP
-#			   Alan Rosenberg &lt;arosen@starburstcom.com&gt;
-hpoms-ci-lstn	5403/udp    # HPOMS-CI-LSTN
+#               5354-5399  Unassigned
+excerpt         5400/udp    # Excerpt Search
+excerpt         5400/tcp    # Excerpt Search
+excerpts        5401/udp    # Excerpt Search Secure
+excerpts        5401/tcp    # Excerpt Search Secure
+#                          John Hinsdale &lt;hin@alma.com&gt;
+mftp            5402/udp    # MFTP
+mftp            5402/tcp    # MFTP
+#                          Alan Rosenberg &lt;arosen@starburstcom.com&gt;
+hpoms-ci-lstn   5403/udp    # HPOMS-CI-LSTN
 hpoms-ci-lstn   5403/tcp    # HPOMS-CI-LSTN
 hpoms-dps-lstn  5404/udp    # HPOMS-DPS-LSTN
 hpoms-dps-lstn  5404/tcp    # HPOMS-DPS-LSTN
-#			   Harold Froehling &lt;hrf@cup.hp.com&gt;
-netsupport	5405/udp    # NetSupport
-netsupport	5405/tcp    # NetSupport
-#			   Paul Sanders &lt;pe77@dial.pipex.com&gt;
-systemics-sox	5406/udp    # Systemics Sox
-systemics-sox	5406/tcp    # Systemics Sox
-#			   Gary Howland &lt;gary@systemics.com&gt;
+#                          Harold Froehling &lt;hrf@cup.hp.com&gt;
+netsupport      5405/udp    # NetSupport
+netsupport      5405/tcp    # NetSupport
+#                          Paul Sanders &lt;pe77@dial.pipex.com&gt;
+systemics-sox   5406/udp    # Systemics Sox
+systemics-sox   5406/tcp    # Systemics Sox
+#                          Gary Howland &lt;gary@systemics.com&gt;
 foresyte-clear  5407/udp    # Foresyte-Clear
 foresyte-clear  5407/tcp    # Foresyte-Clear
-foresyte-sec	5408/udp    # Foresyte-Sec
+foresyte-sec    5408/udp    # Foresyte-Sec
 foresyte-sec    5408/tcp    # Foresyte-Sec
-#			   Jorge Aldana &lt;operator@foresyte.com&gt;
+#                          Jorge Aldana &lt;operator@foresyte.com&gt;
 salient-dtasrv  5409/udp    # Salient Data Server
 salient-dtasrv  5409/tcp    # Salient Data Server
 salient-usrmgr  5410/udp    # Salient User Manager
 salient-usrmgr  5410/tcp    # Salient User Manager
 #                          Richard Farnham &lt;rfarnham@salient.com&gt; 
-actnet		5411/udp    # ActNet
-actnet		5411/tcp    # ActNet
-#			   Simon Robillard &lt;RobillardS@actresearch.com&gt;
-continuus	5412/udp    # Continuus
-continuus	5412/tcp    # Continuus
-#			   Steven Holtsberg &lt;steveh@continuus.com&gt;
-wwiotalk	5413/udp    # WWIOTALK
-wwiotalk	5413/tcp    # WWIOTALK
-#			   Roger Knobbe &lt;RogerK@Wonderware.COM&gt;
-statusd		5414/udp    # StatusD
-statusd		5414/tcp    # StatusD
-#			   Stephen Misel &lt;steve@satelnet.org&gt;
-ns-server	5415/udp    # NS Server
-ns-server	5415/tcp    # NS Server
-#			   Jeffrey Chiao &lt;chiaoj@netsoft.com&gt;
-sns-gateway	5416/udp    # SNS Gateway
-sns-gateway	5416/tcp    # SNS Gateway
-sns-agent	5417/udp    # SNS Agent
-sns-agent	5417/tcp    # SNS Agent
-#	    		   Mary Holstage &lt;holstege@firstfloor.com&gt;
-mcntp		5418/udp    # MCNTP
-mcntp		5418/tcp    # MCNTP
-#			   Heiko Rupp &lt;hwr@pilhuhn.de&gt;
-dj-ice		5419/udp    # DJ-ICE
-dj-ice		5419/tcp    # DJ-ICE
-#			   Don Tyson &lt;don.tyson@cor.dowjones.com&gt;
-cylink-c	5420/udp    # Cylink-C
-cylink-c	5420/tcp    # Cylink-C
-#			   John Jobe &lt;jjobe@cylink.com&gt;
-netsupport2	5421/udp    # Net Support 2
-netsupport2	5421/tcp    # Net Support 2
-#			   Paul Sanders &lt;p.sanders@dial.pipex.com&gt;
+actnet          5411/udp    # ActNet
+actnet          5411/tcp    # ActNet
+#                          Simon Robillard &lt;RobillardS@actresearch.com&gt;
+continuus       5412/udp    # Continuus
+continuus       5412/tcp    # Continuus
+#                          Steven Holtsberg &lt;steveh@continuus.com&gt;
+wwiotalk        5413/udp    # WWIOTALK
+wwiotalk        5413/tcp    # WWIOTALK
+#                          Roger Knobbe &lt;RogerK@Wonderware.COM&gt;
+statusd         5414/udp    # StatusD
+statusd         5414/tcp    # StatusD
+#                          Stephen Misel &lt;steve@satelnet.org&gt;
+ns-server       5415/udp    # NS Server
+ns-server       5415/tcp    # NS Server
+#                          Jeffrey Chiao &lt;chiaoj@netsoft.com&gt;
+sns-gateway     5416/udp    # SNS Gateway
+sns-gateway     5416/tcp    # SNS Gateway
+sns-agent       5417/udp    # SNS Agent
+sns-agent       5417/tcp    # SNS Agent
+#                          Mary Holstage &lt;holstege@firstfloor.com&gt;
+mcntp           5418/udp    # MCNTP
+mcntp           5418/tcp    # MCNTP
+#                          Heiko Rupp &lt;hwr@pilhuhn.de&gt;
+dj-ice          5419/udp    # DJ-ICE
+dj-ice          5419/tcp    # DJ-ICE
+#                          Don Tyson &lt;don.tyson@cor.dowjones.com&gt;
+cylink-c        5420/udp    # Cylink-C
+cylink-c        5420/tcp    # Cylink-C
+#                          John Jobe &lt;jjobe@cylink.com&gt;
+netsupport2     5421/udp    # Net Support 2
+netsupport2     5421/tcp    # Net Support 2
+#                          Paul Sanders &lt;p.sanders@dial.pipex.com&gt;
 salient-mux     5422/udp    # Salient MUX
 salient-mux     5422/tcp    # Salient MUX
 #                          Richard Farnham &lt;rfarnham@salient.com&gt;
@@ -10087,7 +10087,7 @@ park-agent      5431/tcp    # PARK AGENT
 postgresql      5432/udp    # PostgreSQL Database
 postgresql      5432/tcp    # PostgreSQL Database
 #                          Tom Lane &lt;tgl@sss.pgh.pa.us&gt;
-#		5433-5434  Unassigned
+#               5433-5434  Unassigned
 dttl            5435/udp    # Data Tunneling Transceiver Linking (DTTL)
 dttl            5435/tcp    # Data Tunneling Transceiver Linking (DTTL)
 #                          Richard Olsen &lt;Olsen7@liquefaction.com&gt;
@@ -10113,7 +10113,7 @@ ttlpriceproxy   5463/tcp    # TTL Price Proxy
 netops-broker   5465/udp    # NETOPS-BROKER
 netops-broker   5465/tcp    # NETOPS-BROKER
 #                          John R. Deuel &lt;kink@netops.com&gt;
-#		5466-5499  Unassigned
+#               5466-5499  Unassigned
 fcp-addr-srvr1  5500/udp    # fcp-addr-srvr1
 fcp-addr-srvr1  5500/tcp    # fcp-addr-srvr1
 fcp-addr-srvr2  5501/udp    # fcp-addr-srvr2
@@ -10124,7 +10124,7 @@ fcp-srvr-inst2  5503/udp    # fcp-srvr-inst2
 fcp-srvr-inst2  5503/tcp    # fcp-srvr-inst2
 fcp-cics-gw1    5504/udp    # fcp-cics-gw1
 fcp-cics-gw1    5504/tcp    # fcp-cics-gw1
-#			   Mark Zeiss &lt;mark.r.zeiss@ac.com&gt;
+#                          Mark Zeiss &lt;mark.r.zeiss@ac.com&gt;
 #               5505-5552  Unassigned
 sgi-eventmond   5553/udp    # SGI Eventmond Port
 sgi-eventmond   5553/tcp    # SGI Eventmond Port
@@ -10135,29 +10135,29 @@ sgi-esphttp     5554/tcp    # SGI ESP HTTP
 ############Port 5555 also used by HP Omniback#####################
 personal-agent  5555/udp    # Personal Agent
 personal-agent  5555/tcp    # Personal Agent
-#			   Jackie Wu &lt;jackiew@infoseek.com&gt;
+#                          Jackie Wu &lt;jackiew@infoseek.com&gt;
 ###################################################################
-#		5556-5565  Unassigned
+#               5556-5565  Unassigned
 udpplus         5566/udp    # UDPPlus
 udpplus         5566/tcp    # UDPPlus
 #                          Cody Gibson &lt;cody.gibson@intermec.com&gt;
 #               5567-5598  Unassigned
-esinstall	5599/udp    # Enterprise Security Remote Install
-esinstall	5599/tcp    # Enterprise Security Remote Install
-esmmanager	5600/udp    # Enterprise Security Manager
-esmmanager	5600/tcp    # Enterprise Security Manager
-esmagent	5601/udp    # Enterprise Security Agent
-esmagent	5601/tcp    # Enterprise Security Agent
-#			   Kimberly Gibbs &lt;kimgib@CCGATE-UT.AXENT.COM&gt;
-a1-msc		5602/udp    # A1-MSC
-a1-msc		5602/tcp    # A1-MSC
-a1-bs		5603/udp    # A1-BS
-a1-bs		5603/tcp    # A1-BS
-a3-sdunode	5604/udp    # A3-SDUNode
-a3-sdunode	5604/tcp    # A3-SDUNode
-a4-sdunode	5605/udp    # A4-SDUNode
-a4-sdunode	5605/tcp    # A4-SDUNode
-#			   Mike Dolan &lt;MDolan@ihcmail.ih.lucent.com&gt;
+esinstall       5599/udp    # Enterprise Security Remote Install
+esinstall       5599/tcp    # Enterprise Security Remote Install
+esmmanager      5600/udp    # Enterprise Security Manager
+esmmanager      5600/tcp    # Enterprise Security Manager
+esmagent        5601/udp    # Enterprise Security Agent
+esmagent        5601/tcp    # Enterprise Security Agent
+#                          Kimberly Gibbs &lt;kimgib@CCGATE-UT.AXENT.COM&gt;
+a1-msc          5602/udp    # A1-MSC
+a1-msc          5602/tcp    # A1-MSC
+a1-bs           5603/udp    # A1-BS
+a1-bs           5603/tcp    # A1-BS
+a3-sdunode      5604/udp    # A3-SDUNode
+a3-sdunode      5604/tcp    # A3-SDUNode
+a4-sdunode      5605/udp    # A4-SDUNode
+a4-sdunode      5605/tcp    # A4-SDUNode
+#                          Mike Dolan &lt;MDolan@ihcmail.ih.lucent.com&gt;
 #               5606-5630  Unassigned
 pcanywheredata  5631/udp    # pcANYWHEREdata
 pcanywheredata  5631/tcp    # pcANYWHEREdata
@@ -10235,14 +10235,14 @@ openmailns      5766/udp    # OpenMail NewMail Server
 openmailns      5766/tcp    # OpenMail NewMail Server
 s-openmail      5767/udp    # OpenMail Suer Agent Layer (Secure)
 s-openmail      5767/tcp    # OpenMail Suer Agent Layer (Secure)
-openmailpxy	5768/udp    # OpenMail CMTS Server
-openmailpxy	5768/tcp    # OpenMail CMTS Server
+openmailpxy     5768/udp    # OpenMail CMTS Server
+openmailpxy     5768/tcp    # OpenMail CMTS Server
 #                          OpenMail Encyclopedia &gt;opencyc@hpopd.pwd.hp.com&gt;
 #                          Don Loughry &lt;DON_LOUGHRY@hp-cupertino-om4.om.hp.com&gt;
 #               5769-5770  Unassigned
-netagent	5771/udp    # NetAgent
-netagent	5771/tcp    # NetAgent
-#			   Bradley Birnbaum &lt;bradley.birnbaum@eshare.com&gt;
+netagent        5771/udp    # NetAgent
+netagent        5771/tcp    # NetAgent
+#                          Bradley Birnbaum &lt;bradley.birnbaum@eshare.com&gt;
 #               5772-5812  Unassigned
 icmpd           5813/udp    # ICMPD
 icmpd           5813/tcp    # ICMPD
@@ -10252,11 +10252,11 @@ wherehoo        5859/udp    # WHEREHOO
 wherehoo        5859/tcp    # WHEREHOO
 #                          Jim Youll &lt;jim@media.mit.edu&gt;
 #               5860-5967  Unassigned 
-mppolicy-v5	5968/udp    # mppolicy-v5
-mppolicy-v5	5968/tcp    # mppolicy-v5
-mppolicy-mgr	5969/udp    # mppolicy-mgr
-mppolicy-mgr	5969/tcp    # mppolicy-mgr
-#			   Yutaka Ono &lt;ono@saint.nm.fujitsu.co.jp&gt;
+mppolicy-v5     5968/udp    # mppolicy-v5
+mppolicy-v5     5968/tcp    # mppolicy-v5
+mppolicy-mgr    5969/udp    # mppolicy-mgr
+mppolicy-mgr    5969/tcp    # mppolicy-mgr
+#                          Yutaka Ono &lt;ono@saint.nm.fujitsu.co.jp&gt;
 #               5970-5986  Unassigned
 wbem-rmi        5987/udp    # WBEM RMI
 wbem-rmi        5987/tcp    # WBEM RMI
@@ -10280,7 +10280,7 @@ ndl-ahp-svc     6064/tcp    # NDL-AHP-SVC
 #                          John Richmond &lt;john@ndl.co.uk&gt;
 winpharaoh      6065/udp    # WinPharaoh
 winpharaoh      6065/tcp    # WinPharaoh
-#	                   Basil Lee &lt;basil.lee@gnnettest.com&gt;
+#                          Basil Lee &lt;basil.lee@gnnettest.com&gt;
 ewctsp          6066/udp    # EWCTSP
 ewctsp          6066/tcp    # EWCTSP
 #                          Mark Bailon &lt;mark.bailon@ericsson.com&gt;
@@ -10348,7 +10348,7 @@ dtspcd          6112/tcp    # dtspcd
 #               6113-6122  Unassigned
 backup-express  6123/udp    # Backup Express
 backup-express  6123/tcp    # Backup Express
-#			   Chi Shih Chang &lt;cchang@syncsort.com&gt;
+#                          Chi Shih Chang &lt;cchang@syncsort.com&gt;
 #               6124-6140  Unassigned
 meta-corp       6141/udp    # Meta Corporation License Manager
 meta-corp       6141/tcp    # Meta Corporation License Manager
@@ -10417,29 +10417,29 @@ skip-cert-recv  6455/tcp    # SKIP Certificate Receive
 skip-cert-send  6456/tcp    # SKIP Certificate Send
 #                          Tom Markson &lt;markson@osmosys.incog.com&gt;
 #               6457-6470  Unassigned
-lvision-lm	6471/udp    # LVision License Manager
-lvision-lm	6471/tcp    # LVision License Manager
-#			   Brian McKinnon &lt;bmk@lvision.com&gt;
-#		6472-6499  Unassigned
-boks		6500/udp    # BoKS Master
-boks		6500/tcp    # BoKS Master
-boks_servc	6501/udp    # BoKS Servc
-boks_servc	6501/tcp    # BoKS Servc
-boks_servm	6502/udp    # BoKS Servm
-boks_servm	6502/tcp    # BoKS Servm
-boks_clntd	6503/udp    # BoKS Clntd
-boks_clntd	6503/tcp    # BoKS Clntd
+lvision-lm      6471/udp    # LVision License Manager
+lvision-lm      6471/tcp    # LVision License Manager
+#                          Brian McKinnon &lt;bmk@lvision.com&gt;
+#               6472-6499  Unassigned
+boks            6500/udp    # BoKS Master
+boks            6500/tcp    # BoKS Master
+boks_servc      6501/udp    # BoKS Servc
+boks_servc      6501/tcp    # BoKS Servc
+boks_servm      6502/udp    # BoKS Servm
+boks_servm      6502/tcp    # BoKS Servm
+boks_clntd      6503/udp    # BoKS Clntd
+boks_clntd      6503/tcp    # BoKS Clntd
 #                          Magnus Nystrom &lt;magnus@dynas.se&gt; 
-#		6504       Unassigned
-badm_priv	6505/udp    # BoKS Admin Private Port
-badm_priv	6505/tcp    # BoKS Admin Private Port
-badm_pub	6506/udp    # BoKS Admin Public Port
-badm_pub	6506/tcp    # BoKS Admin Public Port
-bdir_priv	6507/udp    # BoKS Dir Server, Private Port
-bdir_priv	6507/tcp    # BoKS Dir Server, Private Port
-bdir_pub	6508/udp    # BoKS Dir Server, Public Port
-bdir_pub	6508/tcp    # BoKS Dir Server, Public Port
-#			   Magnus Nystrom &lt;magnus@dynas.se&gt;
+#               6504       Unassigned
+badm_priv       6505/udp    # BoKS Admin Private Port
+badm_priv       6505/tcp    # BoKS Admin Private Port
+badm_pub        6506/udp    # BoKS Admin Public Port
+badm_pub        6506/tcp    # BoKS Admin Public Port
+bdir_priv       6507/udp    # BoKS Dir Server, Private Port
+bdir_priv       6507/tcp    # BoKS Dir Server, Private Port
+bdir_pub        6508/udp    # BoKS Dir Server, Public Port
+bdir_pub        6508/tcp    # BoKS Dir Server, Public Port
+#                          Magnus Nystrom &lt;magnus@dynas.se&gt;
 mgcs-mfp-port   6509/udp    # MGCS-MFP Port
 mgcs-mfp-port   6509/tcp    # MGCS-MFP Port
 #                          Minoru Ozaki &lt;Minoru.Ozaki@rdmg.mgcs.mei.co.jp&gt;
@@ -10458,12 +10458,12 @@ apc-6548        6548/tcp    # APC 6548
 apc-6549        6549/udp    # APC 6549
 apc-6549        6549/tcp    # APC 6549
 #                          American Power Conversion &lt;ports@apcc.com&gt;
-fg-sysupdate	6550/udp    # fg-sysupdate
-fg-sysupdate	6550/tcp    # fg-sysupdate
-#			   Mark Beyer &lt;mbeyer@freegate.com&gt;
+fg-sysupdate    6550/udp    # fg-sysupdate
+fg-sysupdate    6550/tcp    # fg-sysupdate
+#                          Mark Beyer &lt;mbeyer@freegate.com&gt;
 #               6551-6557  Unassigned
-xdsxdm		6558/udp	 # 
-xdsxdm		6558/tcp	 # 
+xdsxdm          6558/udp         #
+xdsxdm          6558/tcp         #
 #                          Brian Tackett &lt;cym@acrux.net&gt; possible contact
 #               6559-6565  Unassigned
 sane-port       6566/udp    # SANE Control Port
@@ -10489,7 +10489,7 @@ mach            6631/udp    # Mitchell telecom host
 mach            6631/tcp    # Mitchell telecom host
 #                          Mark Derail &lt;mderail@dmib.com&gt; March 2003
 #               6632-6664  Unassigned
-#			   Brian Tackett &lt;cym@acrux.net&gt;
+#                          Brian Tackett &lt;cym@acrux.net&gt;
 vocaltec-gold   6670/udp    # Vocaltec Global Online Directory
 vocaltec-gold   6670/tcp    # Vocaltec Global Online Directory
 #                          Scott Petrack &lt;Scott_Petrack@vocaltec.com&gt;
@@ -10500,9 +10500,9 @@ vision_elmd     6673/udp    # vision_elmd
 vision_elmd     6673/tcp    # vision_elmd
 #                          Chris Kramer &lt;CKramer@gis.shl.com&gt;
 #               6674-6700  Unassigned
-kti-icad-srvr	6701/udp    # KTI/ICAD Nameserver
-kti-icad-srvr	6701/tcp    # KTI/ICAD Nameserver
-#			   Stanley Knutson &lt;Stanley.Knutson@KTIworld.com&gt; 
+kti-icad-srvr   6701/udp    # KTI/ICAD Nameserver
+kti-icad-srvr   6701/tcp    # KTI/ICAD Nameserver
+#                          Stanley Knutson &lt;Stanley.Knutson@KTIworld.com&gt;
 #               6