diff --git a/sys/pc98/i386/userconfig.c b/sys/pc98/i386/userconfig.c
index 60a28f3b4893..f83e09fb34ea 100644
--- a/sys/pc98/i386/userconfig.c
+++ b/sys/pc98/i386/userconfig.c
@@ -46,7 +46,7 @@
  ** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  ** THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  **
- **      $Id: userconfig.c,v 1.76 1999/05/06 09:15:20 kato Exp $
+ **      $Id: userconfig.c,v 1.77 1999/05/09 04:30:08 kato Exp $
  **/
 
 /**
@@ -1041,11 +1041,10 @@ findconflict(DEV_LIST *list)
 	    if ((dp->drq > 0) &&		/* drq conflict? */
 		(dp->drq == sp->drq))
 		dp->conflicts = 1;
-	    if ((dp->maddr > 0) &&		/* maddr conflict? */
-		(dp->maddr == sp->maddr))
-		dp->conflicts = 1;
-	    if ((dp->msize > 0) &&		/* msize conflict? */
-		(dp->msize == sp->msize))
+	    if ((sp->maddr > 0) &&		/* maddr/msize conflict? */
+		(dp->maddr > 0) &&
+		(sp->maddr + ((sp->msize == 0) ? 1 : sp->msize) > dp->maddr) &&
+		(dp->maddr + ((dp->msize == 0) ? 1 : dp->msize) > sp->maddr))
 		dp->conflicts = 1;
 	}
 	count += dp->conflicts;			/* count conflicts */
@@ -2555,7 +2554,7 @@ visuserconfig(void)
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *      $Id: userconfig.c,v 1.76 1999/05/06 09:15:20 kato Exp $
+ *      $Id: userconfig.c,v 1.77 1999/05/09 04:30:08 kato Exp $
  */
 
 #include "scbus.h"