diff --git a/python-setuptools-git.changes b/python-setuptools-git.changes
index 1a46e63..1be40ac 100644
--- a/python-setuptools-git.changes
+++ b/python-setuptools-git.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Mon Jan 14 10:45:12 UTC 2013 - alexandre@exatati.com.br
+
+- Update to 1.0b1:
+  - Sorry, no changelog.
+
 -------------------------------------------------------------------
 Mon Nov 19 14:54:59 UTC 2012 - cfarrell@suse.com
 
@@ -5,6 +11,7 @@ Mon Nov 19 14:54:59 UTC 2012 - cfarrell@suse.com
   SPDX format (or SUSE version thereof)
 
 -------------------------------------------------------------------
+>>>>>>> ./python-setuptools-git/python-setuptools-git.changes.r2
 Tue May  3 22:08:54 UTC 2011 - alexandre@exatati.com.br
 
 - Update to 0.4.2:
diff --git a/python-setuptools-git.spec b/python-setuptools-git.spec
index 2530f53..f518c9b 100644
--- a/python-setuptools-git.spec
+++ b/python-setuptools-git.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package python-setuptools-git
 #
-# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -11,37 +11,33 @@
 # case the license is the MIT License). An "Open Source License" is a
 # license that conforms to the Open Source Definition (Version 1.9)
 # published by the Open Source Initiative.
-#
+
 # Please submit bugfixes or comments via http://bugs.opensuse.org/
 #
 
-%{!?python_sitelib: %global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
-%{!?python_sitearch: %global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
 
-%define mod_name setuptools-git
-
-Name:           python-%{mod_name}
-Version:        0.4.2
+Name:           python-setuptools-git
+Version:        1.0b1
 Release:        0
-Url:            http://ygingras.net/b/tag/setuptools_git
 Summary:        Setuptools revision control system plugin for Git
-License:        SUSE-Public-Domain
+License:        BSD-3-Clause
 Group:          Development/Languages/Python
-Source:         %{mod_name}-%{version}.tar.bz2
-BuildRoot:      %{_tmppath}/%{name}-%{version}-build
+Url:            https://github.com/wichert/setuptools-git
+Source:         http://pypi.python.org/packages/source/s/setuptools-git/setuptools-git-%{version}.tar.gz
 BuildRequires:  python-devel
 BuildRequires:  python-distribute
-%if 0%{?suse_version}
-%py_requires
-%if 0%{?suse_version} > 1110
+BuildRoot:      %{_tmppath}/%{name}-%{version}-build
+%if 0%{?suse_version} && 0%{?suse_version} <= 1110
+%{!?python_sitelib: %global python_sitelib %(python -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
+%{!?python_sitearch: %global python_sitearch %(python -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
+%else
 BuildArch:      noarch
 %endif
-%endif
 
 %description
-This is a plugin for setup tools that enables Git integration.  Once
-installed, Setuptools can be told to include in a module distribution
-all the files tracked by git.  This is an alternative to explicit
+This is a plugin for setuptools that enables git integration. Once
+installed, Setuptools can be told to include in a package distribution
+all the files tracked by git. This is an alternative to explicit
 inclusion specifications with MANIFEST.in.
 
 This package was formerly known as gitlsfiles. The name change is the
@@ -49,20 +45,16 @@ result of an effort by the setuptools plugin developers to provide a
 uniform naming convention.
 
 %prep
-%setup -q -n %{mod_name}-%{version}
+%setup -q -n setuptools-git-%{version}
 
 %build
-export CFLAGS="%{optflags}"
-python setup.py build
+CFLAGS="%{optflags}" python setup.py build
 
 %install
 python setup.py install --prefix=%{_prefix} --root=%{buildroot}
 
-%clean
-rm -rf %{buildroot}
-
 %files
-%defattr(-,root,root)
+%defattr(-,root,root,-)
 %{python_sitelib}/*
 
 %changelog
diff --git a/setuptools-git-0.4.2.tar.bz2 b/setuptools-git-0.4.2.tar.bz2
deleted file mode 100644
index d07bd60..0000000
--- a/setuptools-git-0.4.2.tar.bz2
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:1f39be73fdd5f2c91ce5485fce60423802e0f66781c65dd44f9b312478fb10ee
-size 3803
diff --git a/setuptools-git-1.0b1.tar.gz b/setuptools-git-1.0b1.tar.gz
new file mode 100644
index 0000000..56dee60
--- /dev/null
+++ b/setuptools-git-1.0b1.tar.gz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:dccd496b4166315c2b6b842f3dcd417b22e2cb43aaa4a8983b1ea0ceae0fe328
+size 8570