diff --git a/cs656/lab2/src/PresenceServiceImpl.java b/cs656/lab2/src/PresenceServiceImpl.java
index 367025f..1713c0e 100644
--- a/cs656/lab2/src/PresenceServiceImpl.java
+++ b/cs656/lab2/src/PresenceServiceImpl.java
@@ -38,6 +38,12 @@ public class PresenceServiceImpl implements PresenceService
 
 	public static void main(String[] args)
 	{
+	    int port = 1099;
+	    if (args.length >= 1)
+        {
+            port = Integer.parseInt(args[0]);
+        }
+
 		if (System.getSecurityManager() == null)
 		{
 			System.setSecurityManager(new SecurityManager());
@@ -47,7 +53,7 @@ public class PresenceServiceImpl implements PresenceService
 			PresenceServiceImpl impl = new PresenceServiceImpl();
 			PresenceService stub = (PresenceService)
 				UnicastRemoteObject.exportObject(impl, 0);
-			Registry registry = LocateRegistry.getRegistry();
+			Registry registry = LocateRegistry.getRegistry(port);
 			registry.rebind("PresenceService", stub);
 			System.out.println("PresenceService bound");
 		}
diff --git a/cs656/lab2/src/run_server.sh b/cs656/lab2/src/run_server.sh
index 5bf162a..1f49e50 100755
--- a/cs656/lab2/src/run_server.sh
+++ b/cs656/lab2/src/run_server.sh
@@ -1,6 +1,7 @@
-rmiregistry &
+port = $1
+rmiregistry $port &
 java \
 	-cp /home/holtropj/cs656/lab2/src \
 	-Djava.security.policy=server.policy \
-	PresenceServiceImpl
+	PresenceServiceImpl $port
 pkill rmiregistry