diff --git a/rdp.php b/rdp.php
index 2ecc7af..5ef0e94 100644
--- a/rdp.php
+++ b/rdp.php
@@ -1,10 +1,15 @@
 <?php
 
-$host = filter_input(INPUT_GET, 'v', FILTER_VALIDATE_DOMAIN) ?: filter_input(INPUT_GET, 'v', FILTER_VALIDATE_IP);
+$host = filter_input(INPUT_GET, 'v', FILTER_VALIDATE_DOMAIN, FILTER_FLAG_HOSTNAME) ?: filter_input(INPUT_GET, 'v', FILTER_VALIDATE_IP);
 if (!$host) {
     exit();
 }
 
-header('Content-Disposition: attachment; filename='.str_replace(':', '_', $host).'.rdp');
+$port = filter_input(INPUT_GET, 'p', FILTER_VALIDATE_INT);
+if ($port) {
+    $host = "$host:$port";
+}
+
+header("Content-Disposition: attachment; filename=$host.rdp");
 header('Content-Type: application/rdp');
 echo "full address:s:$host\n";