diff --git a/README.md b/README.md
index 5c31475..a187c42 100644
--- a/README.md
+++ b/README.md
@@ -101,7 +101,7 @@ NIS Domain
 
 #### `nisserver`
 
-NIS Server
+NIS Server - NIS server hostname, leaving this undef will choose NIS broadcast mode
 
 #### `shadow`
 
diff --git a/manifests/init.pp b/manifests/init.pp
index 5721153..63e1611 100644
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -29,7 +29,7 @@
 #    NIS Domain
 #
 #  [*nisserver*]
-#    NIS Server
+#    NIS Server (optional, leave undefined to choose broadcast mode)
 #
 #  [*shadow*]
 #    Enable shadow password
@@ -225,10 +225,6 @@
           fail('The nisdomain parameter is required when nis set to true')
         }
 
-        if !$nisserver {
-          fail('The nisserver parameter is required when nis is set to true')
-        }
-
       }
 
       $nis_flg = $nis ? {
@@ -461,6 +457,19 @@
         }
       }
 
+      if $nis {
+        package { $authconfig::params::nis_packages:
+          ensure => installed,
+        } ->
+        service { $authconfig::params::nis_services:
+          ensure     => running,
+          enable     => true,
+          hasstatus  => true,
+          hasrestart => true,
+          before     => Exec['authconfig command'],
+        }
+      }
+
       if $mkhomedir {
         package { $authconfig::params::mkhomedir_packages:
           ensure => installed,