We present a content delivery infrastructure distributing and maintaining software packages in a large organization. Our work is based on a trace-based analysis of an existing software delivery system that we conducted to find general principles and properties could be used to devise a better solution. Our design combines a conventional server with volunteer nodes that expand its scalability. We rely on Peer-to-Peer technology to speed up content synchronization among the volunteer nodes while maintaining a conventional client/server interface for the service customers. Finally our system includes a novel load balancing mechanism that considers both the synchronization workload and the customer-generated workload of the volunteer nodes. Our simulation results indicate that the feedback information currently available at the server/tracker of the P2P system offers enough information to ensure a fair load distribution among the peers.