diff --git a/.gitignore b/.gitignore
index c2ed378..1a7de82 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,3 +3,5 @@
 /autojump_v19.tar.gz
 /autojump_v20.tar.gz
 /autojump_v21.1.2.tar.gz
+/autojump-release-v21.6.9.tar.gz
+/autojump-f232f9afa8a33c96e50646f3614fdf7ad6cae39f.tar.gz
diff --git a/autojump.spec b/autojump.spec
index 858a413..d662226 100644
--- a/autojump.spec
+++ b/autojump.spec
@@ -1,14 +1,17 @@
+%global commit f232f9afa8a33c96e50646f3614fdf7ad6cae39f
+%global owner joelthelion
+
 Name:           autojump
-Version:        21.1.2
-Release:        4%{?dist}
+Version:        21.6.9
+Release:        1%{?dist}
 
 Summary:        A fast way to navigate your filesystem from the command line
 
 Group:          Applications/Productivity
 License:        GPLv3+
 URL:            http://wiki.github.com/joelthelion/autojump
-Source:         https://github.com/downloads/joelthelion/%{name}/%{name}_v%{version}.tar.gz
-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+Source:         https://github.com/%{owner}/%{name}/archive/%{commit}/%{name}-%{commit}.tar.gz
+
 BuildArch:      noarch
 
 BuildRequires:  pandoc python2-devel
@@ -30,47 +33,24 @@ a database of the directories you use the most from the command line.
 autojump-zsh is designed to work with zsh.
 
 %prep
-%setup -q -n %{name}_v%{version}
+%setup -q -n %{name}-%{commit}
 
 # Fix shebang
 sed -i 's|/usr/bin/env python|/usr/bin/python|' bin/%{name}
-for i in bin/jumpapplet tests/runtests.py; do
-    sed -i 's|/usr/bin/env python2|/usr/bin/python|' "$i"
-done
 
 %build
 make docs
 
-%check
-python tests/runtests.py
-
 %install
-rm -rf $RPM_BUILD_ROOT
-
-mkdir -p $RPM_BUILD_ROOT%{_datadir}/%{name}
-
-# There must be a more elegant way to do that
-install -p bin/icon.png $RPM_BUILD_ROOT%{_datadir}/%{name}/icon.png
-install -Dp bin/%{name} $RPM_BUILD_ROOT%{_bindir}/%{name}
-install -p bin/jumpapplet $RPM_BUILD_ROOT%{_bindir}/jumpapplet
-install -Dpm 644 bin/_j $RPM_BUILD_ROOT%{_datadir}/zsh/site-functions/_j
-install -Dpm 644 bin/%{name}.bash $RPM_BUILD_ROOT%{_sysconfdir}/profile.d/%{name}.bash
-install -Dpm 644 bin/%{name}.sh $RPM_BUILD_ROOT%{_sysconfdir}/profile.d/%{name}.sh
-install -Dpm 644 bin/%{name}.zsh $RPM_BUILD_ROOT%{_sysconfdir}/profile.d/%{name}.zsh
-
-install -Dpm 644 docs/%{name}.1 $RPM_BUILD_ROOT%{_mandir}/man1/%{name}.1
-# jumpapplet needs autojump.py
-ln -s %{name} $RPM_BUILD_ROOT%{_bindir}/%{name}.py
-
-%clean
-rm -rf $RPM_BUILD_ROOT
+./install.sh --destdir %{buildroot} --prefix usr
+# deprecated file
+rm -f %{buildroot}/_j
 
 %files
 %defattr(-,root,root,-)
 %doc LICENSE README.md AUTHORS
 %{_bindir}/%{name}
-%{_bindir}/%{name}.py
-%{_bindir}/jumpapplet
+%{_bindir}/%{name}_argparse.py
 %{_datadir}/%{name}
 %{_mandir}/man1/%{name}.1*
 %config(noreplace) %{_sysconfdir}/profile.d/%{name}.sh
@@ -79,10 +59,11 @@ rm -rf $RPM_BUILD_ROOT
 %files zsh
 %defattr(-,root,root,-)
 %config(noreplace) %{_sysconfdir}/profile.d/%{name}.zsh
-%dir %{_datadir}/zsh/site-functions/
-%{_datadir}/zsh/site-functions/_j
 
 %changelog
+* Thu Mar 20 2014 Tomas Tomecek <ttomecek@redhat.com> - 21.6.9-1
+- Update to 21.6.9
+
 * Sat Aug 03 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 21.1.2-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
 
diff --git a/sources b/sources
index ed92321..fbe2f9f 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-9b6dba043774db140434e18988fa9220  autojump_v21.1.2.tar.gz
+fd7622621f51d0e881f6965eeddfc19e  autojump-f232f9afa8a33c96e50646f3614fdf7ad6cae39f.tar.gz