diff --git a/finance/trytond_stock_product_location/Makefile b/finance/trytond_stock_product_location/Makefile
index 5e0e5249c681..bcac0393f720 100644
--- a/finance/trytond_stock_product_location/Makefile
+++ b/finance/trytond_stock_product_location/Makefile
@@ -1,10 +1,10 @@
-# Created by: Matthias Petermann<matthias@petermann.it>
 # $FreeBSD$
 
 PORTNAME=	trytond_stock_product_location
 PORTVERSION=	2.4.0
 CATEGORIES=	finance python
-MASTER_SITES=	http://downloads2.tryton.org/${PORTVERSION:R}/
+MASTER_SITES=	http://downloads.tryton.org/${PORTVERSION:R}/ \
+		http://downloads2.tryton.org/${PORTVERSION:R}/
 
 MAINTAINER=	matthias@petermann.it
 COMMENT=	Tryton Application Platform (Stock Product Location Module)
@@ -15,6 +15,8 @@ RUN_DEPENDS=	trytond>=2.4.0:${PORTSDIR}/finance/trytond \
 		trytond_product>=2.4.0:${PORTSDIR}/finance/trytond_product \
 		trytond_stock>=2.4.0:${PORTSDIR}/finance/trytond_stock
 
+CONFLICTS=	trytond_stock_product_location-2.[68].*
+
 USE_PYTHON=	yes
 USE_PYDISTUTILS=easy_install