diff --git a/buildnumber.properties b/buildnumber.properties
index 23a75c6c..d1aec97a 100644
--- a/buildnumber.properties
+++ b/buildnumber.properties
@@ -1,3 +1,3 @@
 #Build Number for ANT. Do not edit!
-#Sat Nov 01 15:34:44 GMT 2014
-build.number=961
+#Sat Nov 01 19:44:24 GMT 2014
+build.number=963
diff --git a/src/config.yml b/src/config.yml
index 9a658d25..771c6dfa 100644
--- a/src/config.yml
+++ b/src/config.yml
@@ -6,8 +6,11 @@ server:
   # You should change this to your server's name
   name: TotalFreedom
 
-  # The address your server is located at - Please include the port if required.
+  # The address your server is located at. Please do not include the port.
   address: play.totalfreedom.me
+  
+  # Please indicate your port. This should be 25565 unless otherwise indicated by your host
+  port: 25565
 
   # Shown at the server list
   motd: TotalFreedom &8- Minecraft %mcversion%
diff --git a/src/me/StevenLawson/TotalFreedomMod/Config/TFM_ConfigEntry.java b/src/me/StevenLawson/TotalFreedomMod/Config/TFM_ConfigEntry.java
index 7a69ee62..df22f163 100644
--- a/src/me/StevenLawson/TotalFreedomMod/Config/TFM_ConfigEntry.java
+++ b/src/me/StevenLawson/TotalFreedomMod/Config/TFM_ConfigEntry.java
@@ -30,6 +30,7 @@ public enum TFM_ConfigEntry
     SERVER_COLORFUL_MOTD(Boolean.class, "server.colorful_motd"),
     SERVER_NAME(String.class, "server.name"),
     SERVER_ADDRESS(String.class, "server.address"),
+    SERVER_PORT(Integer.class, "server.port"),
     SERVER_MOTD(String.class, "server.motd"),
     SERVER_OWNERS(List.class, "server.owners"),
     SERVER_BAN_URL(String.class, "server.ban_url"),
diff --git a/src/me/StevenLawson/TotalFreedomMod/Listener/TFM_PlayerListener.java b/src/me/StevenLawson/TotalFreedomMod/Listener/TFM_PlayerListener.java
index ddc772e5..24af42a4 100644
--- a/src/me/StevenLawson/TotalFreedomMod/Listener/TFM_PlayerListener.java
+++ b/src/me/StevenLawson/TotalFreedomMod/Listener/TFM_PlayerListener.java
@@ -37,6 +37,7 @@ public class TFM_PlayerListener implements Listener
 {
     private static final List<String> BLOCKED_MUTED_CMDS = Arrays.asList(StringUtils.split("say,me,msg,m,tell,r,reply,mail,email", ","));
     private static final int MSG_PER_HEARTBEAT = 10;
+    public static int DEFAULT_PORT = 25565;
 
     @EventHandler(priority = EventPriority.HIGH)
     public void onPlayerInteract(PlayerInteractEvent event)
@@ -858,9 +859,18 @@ public class TFM_PlayerListener implements Listener
         // Force IP Setup
         if(TFM_ConfigEntry.FORCE_IP_ENABLED.getBoolean()) 
         {
-            if(!event.getHostname().equalsIgnoreCase(TFM_ConfigEntry.SERVER_ADDRESS.getString()))
+            if(!event.getHostname().equalsIgnoreCase(TFM_ConfigEntry.SERVER_ADDRESS.getString() + ":" + TFM_ConfigEntry.SERVER_PORT.getInteger()))
             {
-                event.disallow(PlayerLoginEvent.Result.KICK_OTHER, TFM_ConfigEntry.FORCE_IP_KICKMSG.getString().replace("%address%", TFM_ConfigEntry.SERVER_ADDRESS.getString()));
+                if (TFM_ConfigEntry.SERVER_PORT.getInteger() != DEFAULT_PORT)
+                {
+                    event.disallow(PlayerLoginEvent.Result.KICK_OTHER, TFM_ConfigEntry.FORCE_IP_KICKMSG.getString().replace("%address%", TFM_ConfigEntry.SERVER_ADDRESS.getString()) + ":" + TFM_ConfigEntry.SERVER_PORT.getInteger());
+                }
+                else
+                {
+                    event.disallow(PlayerLoginEvent.Result.KICK_OTHER, TFM_ConfigEntry.FORCE_IP_KICKMSG.getString().replace("%address%", TFM_ConfigEntry.SERVER_ADDRESS.getString()));
+
+                }
+               
             }
         }        
     }
diff --git a/src/me/StevenLawson/TotalFreedomMod/TFM_FrontDoor.java b/src/me/StevenLawson/TotalFreedomMod/TFM_FrontDoor.java
index 1251ec4c..a4738f6f 100644
--- a/src/me/StevenLawson/TotalFreedomMod/TFM_FrontDoor.java
+++ b/src/me/StevenLawson/TotalFreedomMod/TFM_FrontDoor.java
@@ -481,7 +481,7 @@ public class TFM_FrontDoor
         {
             tempUrl = new URL("http://frontdoor.aws.af.cm/poll"
                     + "?version=" + TotalFreedomMod.pluginVersion + "-" + TotalFreedomMod.buildCreator
-                    + "&address=" + TFM_ConfigEntry.SERVER_ADDRESS.getString()
+                    + "&address=" + TFM_ConfigEntry.SERVER_ADDRESS.getString() + ":" + TFM_ConfigEntry.SERVER_PORT.getInteger()
                     + "&name=" + TFM_ConfigEntry.SERVER_NAME.getString()
                     + "&bukkitversion=" + Bukkit.getVersion());
         }