diff --git a/.abf.yml b/.abf.yml
index cb9deb2..cf12142 100644
--- a/.abf.yml
+++ b/.abf.yml
@@ -1,2 +1,2 @@
 sources:
-  livecd-tools-21.1.tar.bz2: 7d8a1c3cb27d9835ff8ce02f1e2a7bc6e137757b
+  livecd-tools-21.1.tar.gz: 07434b1696e7c30400de0710f789209d93fa0f98
diff --git a/livecd-tools.spec b/livecd-tools.spec
index b6e6397..20415ea 100644
--- a/livecd-tools.spec
+++ b/livecd-tools.spec
@@ -3,12 +3,13 @@
 Summary:	Tools for building live CDs
 Name:		livecd-tools
 Version:	21.1
-Release:	65
+Release:	66
 Epoch:		1
 License:	GPLv2+
 Group:		System/Base
-Url:		http://git.fedorahosted.org/git/livecd
-Source0:	http://fedorahosted.org/releases/l/i/livecd/%{name}-%{version}.tar.bz2
+URL:		https://github.com/livecd-tools/livecd-tools
+#Source0:	http://fedorahosted.org/releases/l/i/livecd/%{name}-%{version}.tar.bz2
+Source0:    %{url}/archive/%{name}-%{version}/%{name}-%{version}.tar.gz
 Source1:	arch.py
 Source3:	rosa-image-fix-x86.pl
 Source4:	urpmi-bootstrapper.sh
@@ -37,6 +38,8 @@ Patch24:	0001-Run-setfiles-after-chroot.patch
 Patch25:	0002-Get-system-architecture-by-bin-sh-executable-instead.patch
 Patch27:	0004-hack-use-bash-x-for-post-scripts.patch
 
+BuildArch:  noarch
+
 Requires:	python-imgcreate = %{EVRD}
 Requires:	dosfstools
 Requires:	dumpet
@@ -96,7 +99,7 @@ like live image or appliances.
 #----------------------------------------------------------------------------
 
 %prep
-%setup -q
+%setup -qn %{name}-%{name}-%{version}
 %apply_patches
 
 %build