diff --git a/puppet-lint b/puppet-lint
new file mode 100755
index 0000000..425e15b
--- /dev/null
+++ b/puppet-lint
@@ -0,0 +1,30 @@
+#!/bin/bash
+
+###
+##  puppet-lint.sh :: run puppet-lint in jenkins
+#
+
+LINT="/var/lib/gems/1.8/bin/puppet-lint"
+
+find "$1" -iname "*pp" | while read file; do
+  _TMP=$(mktemp -p /tmp/ puppet-lint.XXXX)
+  echo "# puppet-lint ${file}"
+  ${LINT} "${file}" > ${_TMP}
+  
+  _WARN=$(grep ^WARNING ${_TMP} | wc -l)
+  _ERR=$(grep ^ERROR ${_TMP} | wc -l)
+
+  if [ ${_WARN} -ge 1 ]; then
+    echo "Warnings from puppet-lint for ${file}:"
+    grep ^WARNING ${_TMP} | awk "{ print \"${file#$1/}\", \$0 }"
+fi
+
+  if [ ${_ERR} -ge 1 ]; then
+    echo "Errors from puppet-lint for ${file}"
+    grep ^ERROR ${_TMP} | awk "{ print \"${file#$1/}\", \$0 }"
+  fi 
+
+  rm ${_TMP}
+  test ${_ERR} -ge 1 && exit 1
+done
+exit 0
diff --git a/puppetca-bash_completion.d b/puppetca-bash_completion.d
index 4df6d01..49b38cc 100644
--- a/puppetca-bash_completion.d
+++ b/puppetca-bash_completion.d
@@ -12,6 +12,11 @@ _puppetca()
     return 0
   fi
 
+  if [[ ${prev} == "--sign" ]] ; then
+     COMPREPLY=( $( compgen -W "$( ls /var/lib/puppet/ssl/ca/requests/*.pem 2>/dev/null | xargs -I {} basename {} .pem)" -- ${cur} ) )
+     return 0
+  fi
+
   if [[ ${prev} == "--clean" ]] ; then
      COMPREPLY=( $( compgen -W "$( ls /var/lib/puppet/ssl/ca/signed/*.pem 2>/dev/null | xargs -I {} basename {} .pem )" -- ${cur} ) )
      return 0
@@ -25,3 +30,4 @@ _puppetca()
 }
 
 complete -F _puppetca puppetca
+complete -F _puppetca puppet cert