diff --git a/salt/modules/system.py b/salt/modules/system.py
index 47f5c61b17..34cc49714d 100644
--- a/salt/modules/system.py
+++ b/salt/modules/system.py
@@ -75,7 +75,7 @@ def reboot():
     return ret
 
 
-def shutdown():
+def shutdown(at_time=None):
     '''
     Shutdown a running system
 
@@ -85,6 +85,10 @@ def shutdown():
 
         salt '*' system.shutdown
     '''
-    cmd = 'shutdown'
+
+    if at_time:
+        cmd = 'shutdown -h {0}'.format(at_time)
+    else:
+        cmd = 'shutdown -h now'
     ret = __salt__['cmd.run'](cmd)
     return ret