diff --git a/src/bin/cddb_lookup/cddb_server.cpp b/src/bin/cddb_lookup/cddb_server.cpp
index df69d46870..d2b16ef815 100644
--- a/src/bin/cddb_lookup/cddb_server.cpp
+++ b/src/bin/cddb_lookup/cddb_server.cpp
@@ -312,7 +312,7 @@ CDDBServer::_ParseAddress(const BString& cddbServer)
 			char* firstInvalid;
 			errno = 0;
 			port = strtol(portString.String(), &firstInvalid, 10);
-			if ((errno == ERANGE && (port == LONG_MAX || port == LONG_MIN))
+			if ((errno == ERANGE && (port == INT32_MAX || port == INT32_MIN))
 				|| (errno != 0 && port == 0)) {
 				return B_ERROR;
 			}