diff --git a/.gitignore b/.gitignore
index ae4fc26..b04230c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 /bumpversion-0.5.3.tar.gz
+/bump2version-0.5.5.tar.gz
diff --git a/bumpversion.spec b/bumpversion.spec
index 781ae0d..f955dc5 100644
--- a/bumpversion.spec
+++ b/bumpversion.spec
@@ -1,14 +1,15 @@
-%global ghuser peritus
+%global ghuser c4urself
+%global ghname bump2version
 
 Name:           bumpversion
-Version:        0.5.3
-Release:        7%{?dist}
+Version:        0.5.5
+Release:        1%{?dist}
 Summary:        Version-bump your software with a single command
 
 Group:          Development/Tools
 License:        MIT
-URL:            https://github.com/%{ghuser}/%{name}
-Source0:        http://github.srcurl.net/%{ghuser}/%{name}/v%{version}/%{name}-%{version}.tar.gz
+URL:            https://github.com/%{ghuser}/%{ghname}
+Source0:        https://github.srcurl.net/%{ghuser}/%{ghname}/v%{version}/%{ghname}-%{version}.tar.gz
 
 BuildArch:      noarch
 BuildRequires:  python3-devel
@@ -25,7 +26,7 @@ commits and tags:
 
 
 %prep
-%setup -q
+%setup -q -n %{ghname}-%{version}
 
 
 %build
@@ -34,6 +35,7 @@ commits and tags:
 
 %install
 %{__python3} setup.py install --skip-build --root %{buildroot}
+mv %{buildroot}%{_bindir}/%{ghname} %{buildroot}%{_bindir}/%{name}
 
 
 %files
@@ -41,13 +43,18 @@ commits and tags:
 %license LICENSE.rst
 %attr(0755,root,root) %{_bindir}/%{name}
 %dir %{python3_sitelib}/%{name}
-%{python3_sitelib}/%{name}/__init__.py*
-%{python3_sitelib}/%{name}-%{version}-*.egg-info
+%{python3_sitelib}/%{name}/*.py
+%{python3_sitelib}/%{ghname}-%{version}-*.egg-info
 %dir %{python3_sitelib}/%{name}/__pycache__
-%{python3_sitelib}/%{name}/__pycache__/__init__.*.py[co]
+%{python3_sitelib}/%{name}/__pycache__/*.py[co]
 
 
 %changelog
+* Mon Jul 31 2017 Jakub Dorňák <jakub.dornak@misli.cz> - 0.5.5-1
+- temporarily switched upstream to https://github.com/c4urself/bump2version
+  since the development of https://github.com/peritus/bumpversion has been stuck
+- update to version 0.5.5 (which among other features creates annotated tags)
+
 * Wed Jul 26 2017 Fedora Release Engineering <releng@fedoraproject.org> - 0.5.3-7
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild
 
diff --git a/sources b/sources
index e1d7bbb..4e0aefd 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-2b7a8440ce813faf17da0ea96c58d7d8  bumpversion-0.5.3.tar.gz
+SHA512 (bump2version-0.5.5.tar.gz) = b0f4fe4a56da28572bb7b0e214a445cb943d53d570ba68729583f6d3400569b5b382240fb5d30cdc070542b0ab0ec5037076d38da4dceb9cb9a8a692846d2497