diff --git a/system/pam_limits.py b/system/pam_limits.py
index 649b9a175f7..ab429bb8808 100644
--- a/system/pam_limits.py
+++ b/system/pam_limits.py
@@ -1,3 +1,4 @@
+#!/usr/bin/python
 # -*- coding: utf-8 -*-
 
 # (c) 2014, Sebastien Rohaut <sebastien.rohaut@gmail.com>
@@ -25,7 +26,7 @@ import re
 DOCUMENTATION = '''
 ---
 module: pam_limits
-version_added: "historical"
+version_added: "2.0"
 short_description: Modify Linux PAM limits
 description:
      - The M(pam_limits) module modify PAM limits, default in /etc/security/limits.conf.
@@ -35,24 +36,20 @@ options:
     description:
       - A username, @groupname, wildcard, uid/gid range.
     required: true
-    default: null
   limit_type:
     description:
       - Limit type : hard or soft.
     required: true
     choices: [ "hard", "soft" ]
-    default: null
   limit_item:
     description:
       - The limit to be set : core, data, nofile, cpu, etc.
     required: true
     choices: [ "core", "data", "fsize", "memlock", "nofile", "rss", "stack", "cpu", "nproc", "as", "maxlogins", "maxsyslogins", "priority", "locks", "sigpending", "msgqueue", "nice", "rtprio", "chroot" ]
-        default: null
   value:
     description:
       - The value of the limit.
     required: true
-    default: null
   backup:
     description:
       - Create a backup file including the timestamp information so you can get
@@ -222,10 +219,7 @@ def main():
     nf.close()
 
     # Copy tempfile to newfile
-    shutil.copy(nf.name, f.name)
-
-    # delete tempfile
-    os.unlink(nf.name)
+    module.atomic_move(nf.name, f.name)
 
     res_args = dict(
         changed = changed, msg = message