diff --git a/jrl-cmakemodules/Makefile.common b/jrl-cmakemodules/Makefile.common
index 887163fd8ab83f9bf88592593af533a514e3726c..f414a6fb06ff3e0dc04f7b304cf3942025168c86 100644
--- a/jrl-cmakemodules/Makefile.common
+++ b/jrl-cmakemodules/Makefile.common
@@ -13,14 +13,30 @@ ifndef VERSION
 endif
 
 DISTNAME?=		${NAME}-${VERSION}
+ifdef USE_PYTHON
+  PKGNAME?=		${PKGTAG.python-}${DISTNAME}
+endif
 
 MASTER_SITES?=		${MASTER_SITE_OPENROBOTS:=${NAME}/}
 MASTER_REPOSITORY?=	${MASTER_REPOSITORY_GITHUB}/${ORG}/${NAME}.git
 CHECKOUT_VCS_OPTS+=	--recursive
 
+ifdef USE_MASTER_GITHUB
+  MASTER_SITES?=	${MASTER_SITE_GITHUB:=${ORG}/${NAME}}/releases/download/v${VERSION}/
+else
+  MASTER_SITES?=	${MASTER_SITE_OPENROBOTS:=${NAME}/}
+endif
+
 CMAKE_ARGS+=		-DCMAKE_INSTALL_LIBDIR=lib
 CMAKE_ARGS+=		-DPYTHON_STANDARD_LAYOUT=ON
 
+ifdef USE_PYTHON
+  CMAKE_ARGS+=		-DPYTHON_EXECUTABLE=${PYTHON}
+  CMAKE_ARGS+=		-DPYTHON_INCLUDE_DIR=${PYTHON_INCLUDE}
+  CMAKE_ARGS+=		-DPYTHON_LIBRARY=${PYTHON_LIB}
+  CMAKE_ARGS+=		-DPYTHON_SITELIB=${PYTHON_SITELIB}
+endif
+
 DYNAMIC_PLIST_DIRS+=	share/doc/${NAME}
 
 include ../../pkgtools/pkg-config/depend.mk