diff --git a/src/org/hyperic/hq/hqapi1/tools/Command.java b/src/org/hyperic/hq/hqapi1/tools/Command.java
index c05ec5fc..52ba2edc 100644
--- a/src/org/hyperic/hq/hqapi1/tools/Command.java
+++ b/src/org/hyperic/hq/hqapi1/tools/Command.java
@@ -193,7 +193,7 @@ protected HQApi getApi(OptionSet s) {
         if (s.hasArgument(OPT_PORT)) {
             port = (Integer)s.valueOf(OPT_PORT);
         } else {
-            port = Integer.parseInt(clientProps.getProperty(OPT_PORT, "7080"));
+            port = Integer.parseInt(clientProps.getProperty(OPT_PORT, "8080"));
         }
 
         String user = (String)s.valueOf(OPT_USER);
diff --git a/xsd/HQApi1.wadl b/xsd/HQApi1.wadl
index 11ecc90a..ff1d9660 100644
--- a/xsd/HQApi1.wadl
+++ b/xsd/HQApi1.wadl
@@ -12,7 +12,7 @@
         <wadl:include href="HQApi1.xsd"/>
     </wadl:grammars>
 
-    <wadl:resources base="http://localhost:7080/hqu/hqapi1/">
+    <wadl:resources base="http://localhost:8080/hqu/hqapi1/">
 
         <wadl:resource path="user/get.hqu">
             <wadl:doc title="HQApi User get command">