diff --git a/.cvsignore b/.cvsignore
index e08b2ba..5c2365d 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-Implode-5.tar.bz2
+Implode-5-20090717.tar.bz2
diff --git a/sources b/sources
index 0387719..55fca4f 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-fa6d475e0099b6e6ad73930c8a017c40  Implode-5.tar.bz2
+6cbc569f1ee43e6cbc138fea9e4a6809  Implode-5-20090717.tar.bz2
diff --git a/sugar-implode-checkout.sh b/sugar-implode-checkout.sh
index 4704665..b41784c 100644
--- a/sugar-implode-checkout.sh
+++ b/sugar-implode-checkout.sh
@@ -5,7 +5,9 @@
 # sugar-implode-checkout.sh
 VERSION=5
 NAME=Implode
+DATE=20090717
+#
 rm -rf $NAME-$VERSION
-git clone git://dev.laptop.org/activities/implode $NAME-$VERSION
-tar -cjvf $NAME-$VERSION.tar.bz2 $NAME-$VERSION
-rm -rf $NAME-$VERSION
+git clone http://git.sugarlabs.org/git/implode/mainline.git $NAME-$VERSION-$DATE
+tar -cjvf $NAME-$VERSION-$DATE.tar.bz2 $NAME-$VERSION-$DATE --exclude=.git
+rm -rf $NAME-$VERSION-$DATE
diff --git a/sugar-implode.spec b/sugar-implode.spec
index ed1976b..f3ac35c 100644
--- a/sugar-implode.spec
+++ b/sugar-implode.spec
@@ -1,19 +1,23 @@
+%global date 20090717
+
 Name:           sugar-implode
 Version:        5
-Release:        2%{?dist}
+Release:        3.%{date}%{?dist}
 Summary:        Implode for Sugar
 
 Group:          Sugar/Activities
-License:        GPLv3+
-URL:            http://wiki.laptop.org/go/Implode
-Source0:        Implode-%{version}.tar.bz2
+License:        GPLv2+
+URL:            http://wiki.sugarlabs.org/go/Activities/Implode
+Source0:        Implode-%{version}-%{date}.tar.bz2
 Source1:        sugar-implode-checkout.sh
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+BuildArch:      noarch
 
 BuildRequires:  python
 BuildRequires:  sugar-toolkit
+
 Requires:       sugar
-BuildArch:      noarch
+
 
 %description
 Implode is a logic game based on the "falling block" model of Tetris. The game
@@ -28,36 +32,42 @@ the end of the game. The levels are generated in such a way that there is
 always a sequence of removals that clears the board. 
 
 %prep
-%setup -q -n Implode-%{version}
+%setup -q -n Implode-%{version}-%{date}
 
 
 %build
-python ./setup.py build
+%{__python} setup.py build
 
 
 %install
 rm -rf %{buildroot}
-python ./setup.py install --prefix=%{buildroot}/%{_prefix}
+%{__python} setup.py install --prefix=%{buildroot}/%{_prefix}
 #executables
 find  %{buildroot}%{sugaractivitydir}Implode.activity/*.py -type f | xargs chmod a+x
 for file in %{buildroot}%{sugaractivitydir}Implode.activity/{board,boardgen,color,gridwidget,implodeactivity,implodegame,setup}.py; do
    chmod a+x $file
 done
+##%find_lang %{name}
 
 
 %clean
 rm -rf  %{buildroot}
 
 
-%files 
+%files
+#-f %{name}.lang
 %defattr(-,root,root,-)
 %doc COPYING NEWS
 %{sugaractivitydir}/Implode.activity/
 
 
-
-
 %changelog
+* Fri Jul 17 2009 Fabian Affolter <fabian@bernewireless.net> - 5-3.20090717
+- Changed release because it's still a git checkout
+- Modified donwload script
+- Translation support will follow, I hope
+- Changed URL to new upstream location
+
 * Wed Feb 25 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 5-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild