diff --git a/puppet/manifests/init.pp b/puppet/manifests/init.pp
index 85d6e6e..4d2a588 100644
--- a/puppet/manifests/init.pp
+++ b/puppet/manifests/init.pp
@@ -387,6 +387,9 @@ class puppet::server::apache inherits puppet::server::mongrel {
 #   $puppet_opencollab_pass:
 #       Wiki password.
 #
+#   $puppet_opencollab_options:
+#       Extra options for opencollab-puppet-uploader.
+#
 class puppet::opencollab {
 
     if !$puppet_opencollab_url {
@@ -419,12 +422,20 @@ class puppet::opencollab {
         content => "[creds]\nurl = ${puppet_opencollab_url}\nusername = ${puppet_opencollab_user}\npassword = ${puppet_opencollab_pass}\n",
     }
 
+    case $operatingsystem {
+        ubuntu:  { $script = "/usr/local/bin/opencollab-puppet-uploader" }
+        default: { $script = "/usr/bin/opencollab-puppet-uploader" }
+    }
+
+    if $puppet_opencollab_options {
+        $script_options = "-c /etc/puppet/opencollab.conf ${puppet_opencollab_options}"
+    } else {
+        $script_options = "-c /etc/puppet/opencollab.conf"
+    }
+
     cron { "opencollab-puppet-uploader":
         ensure  => present,
-        command => $operatingsystem ? {
-            ubuntu  => "/usr/local/bin/opencollab-puppet-uploader -c /etc/puppet/opencollab.conf /var/lib/puppet/yaml/facts/*.yaml",
-            default => "/usr/bin/opencollab-puppet-uploader -c /etc/puppet/opencollab.conf /var/lib/puppet/yaml/facts/*.yaml",
-        },
+        command => "${script} ${script_options} /var/lib/puppet/yaml/facts/*.yaml",
         user    => root,
         minute  => 0,
         hour    => 0,