diff --git a/Makefile b/Makefile
index 941303f..3c07c69 100644
--- a/Makefile
+++ b/Makefile
@@ -5,7 +5,8 @@ docs:
 	python setup.py build_sphinx
 
 install:
-	python setup.py -q install --root=$(DESTDIR) --prefix=$(PREFIX)
+	python setup.py -q install --root=$(DESTDIR) --prefix=$(PREFIX) \
+	                           --install-data=$(DATADIR)
 
 clean:
 	python setup.py clean
diff --git a/debian/control b/debian/control
index ec89731..f2daff2 100644
--- a/debian/control
+++ b/debian/control
@@ -5,8 +5,8 @@ Priority: optional
 Build-Depends: python (>= 2.6.0), python-setuptools (>= 0.6b3), debhelper (>= 7.0.50~), python-support (>= 0.8.4), python-sphinx, bash-completion
 Standards-Version: 3.9.2
 Homepage: http://wiki.meego.com/Release_Infrastructure/BOSS/SkyNET
-Vcs-Git: git://gitorious.org/meego-infrastructure-tools/boss-python-skynet.git
-Vcs-Browser: http://meego.gitorious.org/meego-infrastructure-tools/boss-python-skynet
+Vcs-Git: https://github.com/MeeGoIntegration/python-boss-skynet.git
+Vcs-Browser: https://github.com/MeeGoIntegration/python-boss-skynet
 
 Package: python-boss-skynet
 Architecture: all
diff --git a/rpm/python-boss-skynet.spec b/rpm/python-boss-skynet.spec
index 2e93682..248e18a 100644
--- a/rpm/python-boss-skynet.spec
+++ b/rpm/python-boss-skynet.spec
@@ -2,19 +2,19 @@ Summary: Boss Python SkyNET
 Name: python-boss-skynet
 Version: 0.6.3
 Release: 1
-Source0: %{name}_%{version}.orig.tar.gz
+Source0: %{name}-%{version}.tar.gz
 License: UNKNOWN
 Group: Development/Libraries
 BuildRoot: %{_tmppath}/%{name}-%{version}-buildroot
 Prefix: %{_prefix}
 Obsoletes: boss-skynet < 0.6.0
 Provides: boss-skynet
-BuildRequires: python, python-distribute, supervisor
+BuildRequires: python, python-setuptools, supervisor
 Requires: python, python-ruote-amqp >= 2.1.0, python-amqplib, supervisor, python-setproctitle
-Requires(post): pwdutils
+Requires(post): /usr/sbin/useradd
 BuildArch: noarch
 Vendor: David Greaves <david@dgreaves.com>
-Url: http://github.com/lbt/boss-python-skynet/
+Url: https://github.com/MeeGoIntegration/python-boss-skynet
 
 %description
 UNKNOWN
@@ -28,6 +28,7 @@ make
 %install
 make PREFIX=%{_prefix} DESTDIR=%{buildroot} install
 mkdir -p %{buildroot}/var/log/supervisor
+chmod 770 %{buildroot}/var/log/supervisor
 
 %clean
 rm -rf $RPM_BUILD_ROOT