diff --git a/py-rospkg/Makefile b/py-rospkg/Makefile
index 7c38caea4daa0104d814fab29ab2f1c5e016a2f9..63830cb0e061226fa4e2edcfe3c90da51331c617 100644
--- a/py-rospkg/Makefile
+++ b/py-rospkg/Makefile
@@ -2,11 +2,11 @@
 # Created:			Anthony Mallet on Sun, 15 Jul 2012
 #
 
-ROS_VERSION=		1.0.6
-ROS_COMMIT=		88888b7
-ROS_PKG=		rospkg
-
-PKGNAME=		${PKGTAG.python}-${ROS_PKG}-${ROS_VERSION}
+COMMIT=			a01b6cb
+VERSION=		1.0.7
+PKGNAME=		${PKGTAG.python}-rospkg-${VERSION}
+DISTNAME=		rospkg-${VERSION}
+MASTER_SITES=		${MASTER_SITE_GITHUB:=ros/rospkg/tarball/${VERSION}?f=}
 
 CATEGORIES=		sysutils
 COMMENT=		ROS basic utilities for querying stacks information
@@ -14,10 +14,12 @@ HOMEPAGE=		http://ros.org/wiki/rospkg
 MAINTAINER=		mallet@laas.fr
 LICENSE=		modified-bsd
 
+WRKSRC=			${WRKDIR}/ros-rospkg-${COMMIT}
+
 include ../../wip/ros18-base/Makefile.common
 
 USE_LANGUAGES=
-CONFLICTS+=		py[0-9][0-9]-rospkg-[0-9]*
+CONFLICTS+=		py[0-9][0-9]-rospkg-${VERSION}
 
 SUBST_CLASSES+=		py-syspath py-interp
 SUBST_FILES.py-syspath+=scripts/rosversion
diff --git a/py-rospkg/depend.mk b/py-rospkg/depend.mk
index 321bd88dac11e3991e26788a5fa49edea4d9a838..d2840b45f28d779ae80194864b343ed57f387451 100644
--- a/py-rospkg/depend.mk
+++ b/py-rospkg/depend.mk
@@ -15,7 +15,7 @@ PREFER.py-rospkg?=	robotpkg
 
 DEPEND_USE+=		py-rospkg
 
-DEPEND_ABI.py-rospkg?=	${PKGTAG.python}-rospkg>=1
+DEPEND_ABI.py-rospkg?=	${PKGTAG.python}-rospkg>=0.10.12
 DEPEND_DIR.py-rospkg?=	../../wip/py-rospkg
 
 SYSTEM_SEARCH.py-rospkg=\
diff --git a/py-rospkg/distinfo b/py-rospkg/distinfo
index bd6e5577526bafabb47615d7a1f04d11eab4aea1..f8223eba17745bd65be62f85bc6200575e78bd2c 100644
--- a/py-rospkg/distinfo
+++ b/py-rospkg/distinfo
@@ -1,3 +1,3 @@
-SHA1 (rospkg-1.0.6.tar.gz) = 84114fbc12ccaa39f3dc9d1b8d136f6b3b7b40f5
-RMD160 (rospkg-1.0.6.tar.gz) = 7102059697b8cd9daf26d23faa6b8eb81e67b9c1
-Size (rospkg-1.0.6.tar.gz) = 85158 bytes
+SHA1 (rospkg-1.0.7.tar.gz) = 53a53ef3c770f94251f7300b4e568c9cf38c9414
+RMD160 (rospkg-1.0.7.tar.gz) = e3f74d7ca5f9b2618ec196735b2812e1df1c9764
+Size (rospkg-1.0.7.tar.gz) = 85340 bytes