diff --git a/manifests/direct_download.pp b/manifests/direct_download.pp
index 71bce747f..333ba97d1 100644
--- a/manifests/direct_download.pp
+++ b/manifests/direct_download.pp
@@ -27,9 +27,10 @@
   if $::jenkins::version != 'absent' {
     # make download optional if we are removing...
     archive { $package_file:
-      source => $jenkins::direct_download,
-      path   => $local_file,
-      before => Package[$::jenkins::package_name],
+      source       => $jenkins::direct_download,
+      path         => $local_file,
+      proxy_server => $::jenkins::proxy_server,
+      before       => Package[$::jenkins::package_name],
     }
   }
 
diff --git a/manifests/init.pp b/manifests/init.pp
index 4b4ae88f1..c9eeeb40f 100644
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -276,8 +276,14 @@
       require => Package['jenkins'],
       notify  => Service['jenkins']
     }
+
+    # param format needed by puppet/archive
+    $proxy_server = "http://${jenkins::proxy_host}:${jenkins::proxy_port}"
+  } else {
+    $proxy_server = undef
   }
 
+
   include jenkins::service
 
   if defined('::firewall') {
diff --git a/manifests/plugin.pp b/manifests/plugin.pp
index 55be278ad..9d7ad986a 100644
--- a/manifests/plugin.pp
+++ b/manifests/plugin.pp
@@ -95,14 +95,6 @@
   }
 
   if (empty(grep($installed_plugins, $search))) {
-    if ($jenkins::proxy_host) {
-      # archive expects protocol in proxy_server, but jenkins proxy.xml expects no protocol
-      # assume http
-      $proxy_server = "http://${jenkins::proxy_host}:${jenkins::proxy_port}"
-    } else {
-      $proxy_server = undef
-    }
-
     $enabled_ensure = $enabled ? {
       false   => present,
       default => absent,
@@ -144,7 +136,7 @@
       checksum_verify => $checksum_verify,
       checksum        => $checksum,
       checksum_type   => $digest_type,
-      proxy_server    => $proxy_server,
+      proxy_server    => $::jenkins::proxy_server,
       notify          => Service['jenkins'],
       require         => File[$::jenkins::plugin_dir],
     }
diff --git a/manifests/slave.pp b/manifests/slave.pp
index cc09dac71..a34bb4fe0 100644
--- a/manifests/slave.pp
+++ b/manifests/slave.pp
@@ -252,8 +252,9 @@
 
   if ($manage_client_jar) {
     archive { 'get_swarm_client':
-      source => "${client_url}/${client_jar}",
-      path   => "${slave_home}/${client_jar}",
+      source       => "${client_url}/${client_jar}",
+      path         => "${slave_home}/${client_jar}",
+      proxy_server => $::jenkins::proxy_server,
     }
   }