diff --git a/.gitignore b/.gitignore
index c96ec6b..841d582 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1 @@
-/zeroinstall-injector-1.8.tar.bz2
-/zeroinstall-injector-1.9.tar.bz2
+/0install-2.3.tar.bz2
diff --git a/sources b/sources
index 45871ea..c87c470 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-3c5065d147320f8953e148c6f55d89db  zeroinstall-injector-1.9.tar.bz2
+d9efe80738db407b191edde4764b789a  0install-2.3.tar.bz2
diff --git a/zeroinstall-injector.spec b/zeroinstall-injector.spec
index 02cc46a..7768180 100644
--- a/zeroinstall-injector.spec
+++ b/zeroinstall-injector.spec
@@ -1,15 +1,16 @@
 %global cache_dir /var/cache/0install.net
+%global upstream_name 0install
 #global prerel    rc1
 
 Name:    zeroinstall-injector
-Version: 1.9
+Version: 2.3
 Release: 1%{?dist}
 Summary: The Zero Install Injector (0launch)
 
 Group:   Applications/System
 License: LGPLv2
 URL:     http://0install.net
-Source0: http://downloads.sourceforge.net/project/zero-install/injector/%{version}/%{name}-%{version}.tar.bz2
+Source0: http://downloads.sf.net/project/zero-install/%{upstream_name}/%{version}/%{upstream_name}-%{version}.tar.bz2
 
 BuildArch: noarch
 BuildRequires: python-devel >= 2.6
@@ -50,7 +51,7 @@ the package is run during install or uninstall. The system can
 automatically check for updates when software is run.
 
 %prep
-%setup -q -n %{name}-%{version}
+%setup -q -n %{upstream_name}-%{version}
 
 %build
 %{__python} setup.py build
@@ -61,16 +62,9 @@ rm -rf $RPM_BUILD_ROOT
 mv "$RPM_BUILD_ROOT/usr/man" "$RPM_BUILD_ROOT/%{_datadir}/man"
 mkdir -p "$RPM_BUILD_ROOT%{cache_dir}/implementations"
 
-for i in add manage; do
-  desktop-file-install \
-%if 0%{!?fedora:1}
-    --vendor="" \
-%endif
-    --add-category="System" \
-    --delete-original \
-    --dir=$RPM_BUILD_ROOT%{_datadir}/applications \
-    $RPM_BUILD_ROOT%{_datadir}/applications/zeroinstall-$i.desktop
-done
+desktop-file-validate \
+    $RPM_BUILD_ROOT%{_datadir}/applications/0install.desktop
+
 %find_lang zero-install
 
 %check
@@ -110,11 +104,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 
 %files -f zero-install.lang
 %defattr(-,root,root,-)
-%doc COPYING README
+%doc COPYING README.md
 %{_bindir}/0*
-%config(noreplace) %{_sysconfdir}/xdg/menus/applications-merged/zeroinstall.menu
 %{_datadir}/applications/*.desktop
-%{_datadir}/desktop-directories/zeroinstall.directory
 %{_datadir}/icons/hicolor/*/apps/zeroinstall.png
 %{_datadir}/icons/hicolor/scalable/apps/zeroinstall.svg
 %{python_sitelib}/zeroinstall/
@@ -124,8 +116,39 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 %{_mandir}/man1/0*
 %dir %{cache_dir}
 %attr(755,zeroinst,zeroinst) %{cache_dir}/implementations
+%dir %{_datadir}/bash-completion
+%dir %{_datadir}/bash-completion/completions
+%{_datadir}/bash-completion/completions/0install
+%dir %{_datadir}/fish
+%dir %{_datadir}/fish/completions
+%{_datadir}/fish/completions/0install.fish
+%dir %{_datadir}/zsh
+%dir %{_datadir}/zsh/site-functions
+%{_datadir}/zsh/site-functions/_0install
+
 
 %changelog
+* Fri Jul  5 2013 Michel Salim <salimma@fedoraproject.org> - 2.3-1
+- Update to 2.3
+
+* Mon May  6 2013 Michel Salim <salimma@fedoraproject.org> - 2.2-1
+- Update to 2.2
+
+* Fri Apr  5 2013 Michel Salim <salimma@fedoraproject.org> - 2.1-1
+- Update to 2.1
+
+* Wed Mar  6 2013 Michel Salim <salimma@fedoraproject.org> - 2.0-1
+- Update to 2.0
+
+* Mon Feb 25 2013 Michel Salim <salimma@fedoraproject.org> - 1.16-1
+- Update to 1.16
+
+* Mon Nov 19 2012 Michel Salim <salimma@fedoraproject.org> - 1.13-1
+- Update to 1.13
+
+* Wed Sep  5 2012 Michel Salim <salimma@fedoraproject.org> - 1.11-1
+- Update to 1.11
+
 * Fri Jun 29 2012 Michel Salim <salimma@fedoraproject.org> - 1.9-1
 - Update to 1.9
 - Remove redundant %%{python_sitelib} declaration
@@ -237,7 +260,7 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 
 * Sat Feb 25 2006 Michel Salim <michel.salim@gmail.com> 0.18-3
 - Add Python-related requirements, BuildReq on gnupg to decrypt upstream source
- 
+
 * Sat Feb 18 2006 Michel Salim <michel.salim@gmail.com> 0.18-2
 - Use _mandir, discard CFLAGS and unused python_sitearch definition