This work address the adding, removing and upgrading of network elements in a computer network at run-time. This is already accomplished by Sun Microsystems Jini architecture, but we have investigated if it is possible to create a maintenance system that can handle this, using CORBA. We also want the manual intervention to be minimal. We have discovered that it is possible to create such a system, using CORBA, and that this solution also can handle upgrading a network element at run-time. This report outlines the design of this system, realizing automatic run-time network maintenance.