diff --git a/ChangeLog b/ChangeLog
index 34c0f55..d98cf34 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -27,7 +27,7 @@ Version NEXT
 	  source port was reused or not. Old code did that but not over
 	  server restarts.
 	INFO file updated with fresh information
-	fsetupcmd - reject port number > 65535
+	fsetupcmd and fhostcmd now reject port number > 65535
 	fsetupcmd - code cleaned a bit. Error message is now
 	  fsetup: No host given! instead of fhost:
 	fsetupcmd got -l option. It lists all known fsp servers collected
diff --git a/clients/fhostcmd.c b/clients/fhostcmd.c
index 237baff..99ab4fb 100644
--- a/clients/fhostcmd.c
+++ b/clients/fhostcmd.c
@@ -152,7 +152,7 @@ int main (int argc, char ** argv)
       if (!isdigit(*p) && *p!='.') setup->hostname=argv[optind];
     if (!setup->hostname) setup->hostaddr=argv[optind];
     setup->port=atol(argv[optind+1]);
-    if(setup->port==0)
+    if(setup->port==0 || setup->port > 65535)
 	setup=init_host();
     if (argc > optind + 1) setup->dir=argv[optind+2]; /* directory given, too */
   } else if (argc > optind) { /* abbreviation given */