diff --git a/Changes b/Changes
index 29708a7d4..186ece666 100644
--- a/Changes
+++ b/Changes
@@ -1,6 +1,7 @@
 Anope Version S V N
 -------------------
 Provided by Anope Dev. <dev@anope.org> - 2004
+07/05 A Warning when LocalAddress conflicts with RemoteServer             [#118]
 06/18 A Added proper Bahamut1.8 support.                                  [ #55]
 07/04 F Fixed a bug with m_time.                                          [ #00]
 06/30 F Fixed bug which caused failure in anope crontab script.           [ #00]
diff --git a/config.c b/config.c
index 03c7e60f6..e2d09f9e3 100644
--- a/config.c
+++ b/config.c
@@ -929,6 +929,21 @@ int read_config(int reload)
         if (RemoteServer3)
             CHECK(RemoteServer2);
     }
+    if (!reload) {
+        if (LocalHost) {
+            if ((!stricmp(LocalHost, RemoteServer))
+                && LocalPort == RemotePort) {
+                printf
+                    ("\n*** LocalAddress and RemoteServer are set to use the same IP address\n"
+                     "*** (%s) and port (%d). This would have resulted in errors.\n"
+                     "*** Change the LocalAddress to bind to another port.\n",
+                     RemoteServer, LocalPort);
+                retval = 0;
+            }
+        }
+    }
+
+
     CHECK(NetworkName);
     if (!reload) {
         CHEK2(temp_userhost, ServiceUser);
diff --git a/version.log b/version.log
index 5e9b1d22d..b3e0ff9f2 100644
--- a/version.log
+++ b/version.log
@@ -8,10 +8,14 @@
 VERSION_MAJOR="1"
 VERSION_MINOR="7"
 VERSION_PATCH="4"
-VERSION_BUILD="228"
+VERSION_BUILD="229"
 
 # $Log$
 #
+# BUILD : 1.7.4 (229)
+# BUGS  : 118
+# NOTES : Added warning for a config conflict between LocalAddress and RemoteServer
+#
 # BUILD : 1.7.4 (228)
 # BUGS  : 
 # NOTES : Fixed a bug with m_time.